These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / reiserfs / namei.c

diff --git a/kernel/fs/reiserfs/namei.c b/kernel/fs/reiserfs/namei.c
index b55a074..47f9698 100644 (file)
--- a/kernel/fs/reiserfs/namei.c
+++ b/kernel/fs/reiserfs/namei.c
@@ -613,8 +613,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, umode_t mode)
         * we have to set uid and gid here
         */
        inode_init_owner(inode, dir, mode);
-       dquot_initialize(inode);
-       return 0;
+       return dquot_initialize(inode);
 }
 
 static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
@@ -633,12 +632,18 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod
        struct reiserfs_transaction_handle th;
        struct reiserfs_security_handle security;
 
-       dquot_initialize(dir);
+       retval = dquot_initialize(dir);
+       if (retval)
+               return retval;
 
        if (!(inode = new_inode(dir->i_sb))) {
                return -ENOMEM;
        }
-       new_inode_init(inode, dir, mode);
+       retval = new_inode_init(inode, dir, mode);
+       if (retval) {
+               drop_new_inode(inode);
+               return retval;
+       }
 
        jbegin_count += reiserfs_cache_default_acl(dir);
        retval = reiserfs_security_init(dir, inode, &dentry->d_name, &security);
@@ -707,15 +712,18 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode
            2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb) +
                 REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb));
 
-       if (!new_valid_dev(rdev))
-               return -EINVAL;
-
-       dquot_initialize(dir);
+       retval = dquot_initialize(dir);
+       if (retval)
+               return retval;
 
        if (!(inode = new_inode(dir->i_sb))) {
                return -ENOMEM;
        }
-       new_inode_init(inode, dir, mode);
+       retval = new_inode_init(inode, dir, mode);
+       if (retval) {
+               drop_new_inode(inode);
+               return retval;
+       }
 
        jbegin_count += reiserfs_cache_default_acl(dir);
        retval = reiserfs_security_init(dir, inode, &dentry->d_name, &security);
@@ -787,7 +795,9 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
            2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb) +
                 REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb));
 
-       dquot_initialize(dir);
+       retval = dquot_initialize(dir);
+       if (retval)
+               return retval;
 
 #ifdef DISPLACE_NEW_PACKING_LOCALITIES
        /*
@@ -800,7 +810,11 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
        if (!(inode = new_inode(dir->i_sb))) {
                return -ENOMEM;
        }
-       new_inode_init(inode, dir, mode);
+       retval = new_inode_init(inode, dir, mode);
+       if (retval) {
+               drop_new_inode(inode);
+               return retval;
+       }
 
        jbegin_count += reiserfs_cache_default_acl(dir);
        retval = reiserfs_security_init(dir, inode, &dentry->d_name, &security);
@@ -899,7 +913,9 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
            JOURNAL_PER_BALANCE_CNT * 2 + 2 +
            4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);
 
-       dquot_initialize(dir);
+       retval = dquot_initialize(dir);
+       if (retval)
+               return retval;
 
        reiserfs_write_lock(dir->i_sb);
        retval = journal_begin(&th, dir->i_sb, jbegin_count);
@@ -985,7 +1001,9 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
        int jbegin_count;
        unsigned long savelink;
 
-       dquot_initialize(dir);
+       retval = dquot_initialize(dir);
+       if (retval)
+               return retval;
 
        inode = d_inode(dentry);
 
@@ -1095,12 +1113,18 @@ static int reiserfs_symlink(struct inode *parent_dir,
            2 * (REISERFS_QUOTA_INIT_BLOCKS(parent_dir->i_sb) +
                 REISERFS_QUOTA_TRANS_BLOCKS(parent_dir->i_sb));
 
-       dquot_initialize(parent_dir);
+       retval = dquot_initialize(parent_dir);
+       if (retval)
+               return retval;
 
        if (!(inode = new_inode(parent_dir->i_sb))) {
                return -ENOMEM;
        }
-       new_inode_init(inode, parent_dir, mode);
+       retval = new_inode_init(inode, parent_dir, mode);
+       if (retval) {
+               drop_new_inode(inode);
+               return retval;
+       }
 
        retval = reiserfs_security_init(parent_dir, inode, &dentry->d_name,
                                        &security);
@@ -1184,7 +1208,9 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
            JOURNAL_PER_BALANCE_CNT * 3 +
            2 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);
 
-       dquot_initialize(dir);
+       retval = dquot_initialize(dir);
+       if (retval)
+               return retval;
 
        reiserfs_write_lock(dir->i_sb);
        if (inode->i_nlink >= REISERFS_LINK_MAX) {
@@ -1308,8 +1334,12 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
            JOURNAL_PER_BALANCE_CNT * 3 + 5 +
            4 * REISERFS_QUOTA_TRANS_BLOCKS(old_dir->i_sb);
 
-       dquot_initialize(old_dir);
-       dquot_initialize(new_dir);
+       retval = dquot_initialize(old_dir);
+       if (retval)
+               return retval;
+       retval = dquot_initialize(new_dir);
+       if (retval)
+               return retval;
 
        old_inode = d_inode(old_dentry);
        new_dentry_inode = d_inode(new_dentry);