btrfs: remove unnecessary curly braces in btrfs_get_acl

[sfrench/cifs-2.6.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 15e1dfef56a5915a5979c3b74c513a714cc310c6..3b66c957ea6f2a02f49e8581d032cf22745ea80c 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -30,23 +30,22 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
                name = XATTR_NAME_POSIX_ACL_DEFAULT;
                break;
        default:
-               BUG();
+               return ERR_PTR(-EINVAL);
        }
 
-       size = btrfs_getxattr(inode, name, "", 0);
+       size = btrfs_getxattr(inode, name, NULL, 0);
        if (size > 0) {
                value = kzalloc(size, GFP_KERNEL);
                if (!value)
                        return ERR_PTR(-ENOMEM);
                size = btrfs_getxattr(inode, name, value, size);
        }
-       if (size > 0) {
+       if (size > 0)
                acl = posix_acl_from_xattr(&init_user_ns, value, size);
-       } else if (size == -ERANGE || size == -ENODATA || size == 0) {
+       else if (size == -ENODATA || size == 0)
                acl = NULL;
-       } else {
-               acl = ERR_PTR(-EIO);
-       }
+       else
+               acl = ERR_PTR(size);
        kfree(value);
 
        return acl;