Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / fs / ext4 / xattr.c

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 82dc5e673d5c4d91bb9a0d0dd50ebf1238f58583..b67a176bfcf9f9548dc78d826c7bd854f76bb499 100644 (file)
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1565,46 +1565,49 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value,
 /*
  * Add value of the EA in an inode.
  */
-static int ext4_xattr_inode_lookup_create(handle_t *handle, struct inode *inode,
-                                         const void *value, size_t value_len,
-                                         struct inode **ret_inode)
+static struct inode *ext4_xattr_inode_lookup_create(handle_t *handle,
+               struct inode *inode, const void *value, size_t value_len)
 {
        struct inode *ea_inode;
        u32 hash;
        int err;
 
+       /* Account inode & space to quota even if sharing... */
+       err = ext4_xattr_inode_alloc_quota(inode, value_len);
+       if (err)
+               return ERR_PTR(err);
+
        hash = ext4_xattr_inode_hash(EXT4_SB(inode->i_sb), value, value_len);
        ea_inode = ext4_xattr_inode_cache_find(inode, value, value_len, hash);
        if (ea_inode) {
                err = ext4_xattr_inode_inc_ref(handle, ea_inode);
-               if (err) {
-                       iput(ea_inode);
-                       return err;
-               }
-
-               *ret_inode = ea_inode;
-               return 0;
+               if (err)
+                       goto out_err;
+               return ea_inode;
        }
 
        /* Create an inode for the EA value */
        ea_inode = ext4_xattr_inode_create(handle, inode, hash);
-       if (IS_ERR(ea_inode))
-               return PTR_ERR(ea_inode);
+       if (IS_ERR(ea_inode)) {
+               ext4_xattr_inode_free_quota(inode, NULL, value_len);
+               return ea_inode;
+       }
 
        err = ext4_xattr_inode_write(handle, ea_inode, value, value_len);
        if (err) {
                if (ext4_xattr_inode_dec_ref(handle, ea_inode))
                        ext4_warning_inode(ea_inode, "cleanup dec ref error %d", err);
-               iput(ea_inode);
-               return err;
+               goto out_err;
        }
 
        if (EA_INODE_CACHE(inode))
                mb_cache_entry_create(EA_INODE_CACHE(inode), GFP_NOFS, hash,
                                      ea_inode->i_ino, true /* reusable */);
-
-       *ret_inode = ea_inode;
-       return 0;
+       return ea_inode;
+out_err:
+       iput(ea_inode);
+       ext4_xattr_inode_free_quota(inode, NULL, value_len);
+       return ERR_PTR(err);
 }
 
 /*
@@ -1712,16 +1715,11 @@ static int ext4_xattr_set_entry(struct ext4_xattr_info *i,
        if (i->value && in_inode) {
                WARN_ON_ONCE(!i->value_len);
 
-               ret = ext4_xattr_inode_alloc_quota(inode, i->value_len);
-               if (ret)
-                       goto out;
-
-               ret = ext4_xattr_inode_lookup_create(handle, inode, i->value,
-                                                    i->value_len,
-                                                    &new_ea_inode);
-               if (ret) {
+               new_ea_inode = ext4_xattr_inode_lookup_create(handle, inode,
+                                       i->value, i->value_len);
+               if (IS_ERR(new_ea_inode)) {
+                       ret = PTR_ERR(new_ea_inode);
                        new_ea_inode = NULL;
-                       ext4_xattr_inode_free_quota(inode, NULL, i->value_len);
                        goto out;
                }
        }
@@ -2160,17 +2158,6 @@ getblk_failed:
                                                      ENTRY(header(s->base)+1));
                        if (error)
                                goto getblk_failed;
-                       if (ea_inode) {
-                               /* Drop the extra ref on ea_inode. */
-                               error = ext4_xattr_inode_dec_ref(handle,
-                                                                ea_inode);
-                               if (error)
-                                       ext4_warning_inode(ea_inode,
-                                                          "dec ref error=%d",
-                                                          error);
-                               iput(ea_inode);
-                               ea_inode = NULL;
-                       }
 
                        lock_buffer(new_bh);
                        error = ext4_journal_get_create_access(handle, sb,