View | Details | Raw Unified | Return to bug 214733
Collapse All | Expand All

(-)a/fs/ubifs/budget.c (+2 lines)
Lines 51-57 Link Here
51 
static void shrink_liability(struct ubifs_info *c, int nr_to_write)
 51 
static void shrink_liability(struct ubifs_info *c, int nr_to_write)
52 
{
 52 
{
53 
	down_read(&c->vfs_sb->s_umount);
 53 
	down_read(&c->vfs_sb->s_umount);
54 
	pr_err("[%s] wait shrink ...\n", current->comm);
54 
	writeback_inodes_sb_nr(c->vfs_sb, nr_to_write, WB_REASON_FS_FREE_SPACE);
 55 
	writeback_inodes_sb_nr(c->vfs_sb, nr_to_write, WB_REASON_FS_FREE_SPACE);
56 
	pr_err("shrink DONE\n");
55 
	up_read(&c->vfs_sb->s_umount);
 57 
	up_read(&c->vfs_sb->s_umount);
56 
}
 58 
}
57 

          59
          

        



(-)a/fs/ubifs/dir.c
      (-1 / +5 lines)




  

    
      
            Lines 1246-1252
          static void unlock_4_inodes(struct inode *inode1, struct inode *inode2,
      
      
        Link Here
      
    
  

        

          1246
          
		mutex_unlock(&ubifs_inode(inode2)->ui_mutex);

          1246
          
		mutex_unlock(&ubifs_inode(inode2)->ui_mutex);

        

        

          1247
          
	mutex_unlock(&ubifs_inode(inode1)->ui_mutex);

          1247
          
	mutex_unlock(&ubifs_inode(inode1)->ui_mutex);

        

        

          1248
          
}

          1248
          
}

        

          
            

              1249
              


              1249
              
#include <linux/delay.h>

            

        

          1250
          
static int do_rename(struct inode *old_dir, struct dentry *old_dentry,

          1250
          
static int do_rename(struct inode *old_dir, struct dentry *old_dentry,

        

        

          1251
          
		     struct inode *new_dir, struct dentry *new_dentry,

          1251
          
		     struct inode *new_dir, struct dentry *new_dentry,

        

        

          1252
          
		     unsigned int flags)

          1252
          
		     unsigned int flags)

        

  

    
      
            Lines 1423-1429
          static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
      
      
        Link Here
      
    
  

        

          1423
          
				.dirtied_ino_d = \

          1423
          
				.dirtied_ino_d = \

        

        

          1424
          
				ALIGN(ubifs_inode(whiteout)->data_len, 8) };

          1424
          
				ALIGN(ubifs_inode(whiteout)->data_len, 8) };

        

        

          1425
          

          1425
          

        

            

              
              
              1426
              
		pr_err("---- Wait for consume space ---\n");

            

            

              1427
              
		msleep(8000);

            

            

              1428
              
		pr_err("~~~~~~ Begin budget space ~~~~~\n");

            

        

          1426
          
		err = ubifs_budget_space(c, &wht_req);

          1429
          
		err = ubifs_budget_space(c, &wht_req);

        

            

              
              
              1430
              
		pr_err("======\n");

            

        

          1427
          
		if (err) {

          1431
          
		if (err) {

        

        

          1428
          
			kfree(whiteout_ui->data);

          1432
          
			kfree(whiteout_ui->data);

        

        

          1429
          
			whiteout_ui->data_len = 0;

          1433
          
			whiteout_ui->data_len = 0;

        






  

  Return to bug 214733