From: David Sterba Date: Fri, 30 May 2025 16:18:18 +0000 (+0200) Subject: btrfs: rename err to ret in btrfs_init_inode_security() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b71a348513e62f17f0ba56ac406a366277f03ba7;p=users%2Fjedix%2Flinux-maple.git btrfs: rename err to ret in btrfs_init_inode_security() Unify naming of return value to the preferred way. Reviewed-by: Anand Jain Signed-off-by: David Sterba --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1620265924b2..8d293638615c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -423,18 +423,18 @@ static int btrfs_dirty_inode(struct btrfs_inode *inode); static int btrfs_init_inode_security(struct btrfs_trans_handle *trans, struct btrfs_new_inode_args *args) { - int err; + int ret; if (args->default_acl) { - err = __btrfs_set_acl(trans, args->inode, args->default_acl, + ret = __btrfs_set_acl(trans, args->inode, args->default_acl, ACL_TYPE_DEFAULT); - if (err) - return err; + if (ret) + return ret; } if (args->acl) { - err = __btrfs_set_acl(trans, args->inode, args->acl, ACL_TYPE_ACCESS); - if (err) - return err; + ret = __btrfs_set_acl(trans, args->inode, args->acl, ACL_TYPE_ACCESS); + if (ret) + return ret; } if (!args->default_acl && !args->acl) cache_no_acl(args->inode);