summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/xattr.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-01-20 08:54:07 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:57 -0500
commitf85b7379cd76ad25590c4059299b018eac6fbc50 (patch)
tree284d4f55b0abebebe37702990979132cec79e523 /fs/btrfs/xattr.c
parentf329e319714cd0d72479bae4e495ebedf765b2e4 (diff)
btrfs: fix over-80 lines introduced by previous cleanups
This goes as a separate patch because fixing that inside the patches caused too many many conflicts. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r--fs/btrfs/xattr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 6cf3b0f1bef6..b3cbf80c5acf 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -47,8 +47,8 @@ ssize_t __btrfs_getxattr(struct inode *inode, const char *name,
47 return -ENOMEM; 47 return -ENOMEM;
48 48
49 /* lookup the xattr by name */ 49 /* lookup the xattr by name */
50 di = btrfs_lookup_xattr(NULL, root, path, btrfs_ino(BTRFS_I(inode)), name, 50 di = btrfs_lookup_xattr(NULL, root, path, btrfs_ino(BTRFS_I(inode)),
51 strlen(name), 0); 51 name, strlen(name), 0);
52 if (!di) { 52 if (!di) {
53 ret = -ENODATA; 53 ret = -ENODATA;
54 goto out; 54 goto out;
@@ -108,8 +108,8 @@ static int do_setxattr(struct btrfs_trans_handle *trans,
108 path->skip_release_on_error = 1; 108 path->skip_release_on_error = 1;
109 109
110 if (!value) { 110 if (!value) {
111 di = btrfs_lookup_xattr(trans, root, path, btrfs_ino(BTRFS_I(inode)), 111 di = btrfs_lookup_xattr(trans, root, path,
112 name, name_len, -1); 112 btrfs_ino(BTRFS_I(inode)), name, name_len, -1);
113 if (!di && (flags & XATTR_REPLACE)) 113 if (!di && (flags & XATTR_REPLACE))
114 ret = -ENODATA; 114 ret = -ENODATA;
115 else if (IS_ERR(di)) 115 else if (IS_ERR(di))
@@ -128,8 +128,8 @@ static int do_setxattr(struct btrfs_trans_handle *trans,
128 */ 128 */
129 if (flags & XATTR_REPLACE) { 129 if (flags & XATTR_REPLACE) {
130 ASSERT(inode_is_locked(inode)); 130 ASSERT(inode_is_locked(inode));
131 di = btrfs_lookup_xattr(NULL, root, path, btrfs_ino(BTRFS_I(inode)), 131 di = btrfs_lookup_xattr(NULL, root, path,
132 name, name_len, 0); 132 btrfs_ino(BTRFS_I(inode)), name, name_len, 0);
133 if (!di) 133 if (!di)
134 ret = -ENODATA; 134 ret = -ENODATA;
135 else if (IS_ERR(di)) 135 else if (IS_ERR(di))