From: Anand Jain Date: Fri, 12 Apr 2019 08:02:57 +0000 (+0800) Subject: btrfs: remove redundant readonly root check in btrfs_setxattr_trans X-Git-Tag: v5.2-rc1~163^2~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=353c2ea735e4b54fb6250861e67b51b1bcb47198;p=thirdparty%2Flinux.git btrfs: remove redundant readonly root check in btrfs_setxattr_trans btrfs_setxattr_trans() is called by 5 functions as below and all of them do updates. None of them would be roun on a read-only root. So its ok to remove the readonly root check here as it's a high-level conditon. 1. __btrfs_set_acl() btrfs_init_acl() btrfs_init_inode_security() 2. __btrfs_set_acl() btrfs_set_acl() 3. btrfs_set_prop() btrfs_set_prop_trans() / \ btrfs_ioctl_setflags() btrfs_xattr_handler_set_prop() 4. btrfs_xattr_handler_set() 5. btrfs_initxattrs() btrfs_xattr_security_init() btrfs_init_inode_security() Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index b2b68676ec527..4c447b1f32e55 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c @@ -226,9 +226,6 @@ int btrfs_setxattr_trans(struct btrfs_trans_handle *trans, struct btrfs_root *root = BTRFS_I(inode)->root; int ret; - if (btrfs_root_readonly(root)) - return -EROFS; - if (trans) return btrfs_setxattr(trans, inode, name, value, size, flags);