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

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

diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c
index 9c0d2316031b1beceda4e1b68dcda4e34184a89e..754f17bba68edb600c0731bee21edff4647c522a 100644 (file)
--- a/fs/bcachefs/xattr.c
+++ b/fs/bcachefs/xattr.c
@@ -544,11 +544,11 @@ static int bch2_xattr_bcachefs_set(const struct xattr_handler *handler,
                kfree(buf);
 
                if (ret < 0)
-                       return ret;
+                       goto err_class_exit;
 
                ret = bch2_opt_check_may_set(c, opt_id, v);
                if (ret < 0)
-                       return ret;
+                       goto err_class_exit;
 
                s.v = v + 1;
                s.defined = true;
@@ -595,6 +595,7 @@ err:
             (opt_id == Opt_compression && !inode_opt_get(c, &inode->ei_inode, background_compression))))
                bch2_set_rebalance_needs_scan(c, inode->ei_inode.bi_inum);
 
+err_class_exit:
        return bch2_err_class(ret);
 }