summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/xattr.c
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@redhat.com>2007-11-19 10:18:17 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:57 -0400
commit1caf9342fc71d020e788a59598a44d4ea0136b36 (patch)
treee54d756bd124515b262f56b22cd9c169b8b00027 /fs/btrfs/xattr.c
parent5cf664263b05beb080bf95037e4c3bd50c80b096 (diff)
downloadlinux-stable-1caf9342fc71d020e788a59598a44d4ea0136b36.tar.gz
linux-stable-1caf9342fc71d020e788a59598a44d4ea0136b36.tar.bz2
linux-stable-1caf9342fc71d020e788a59598a44d4ea0136b36.zip
Btrfs: Make ACLs return EOPNOTSUPP for now
There was a slight problem with ACL's returning EINVAL when you tried to set an ACL. This isn't correct, we should be returning EOPNOTSUPP, so I did a very ugly thing and just commented everybody out and made them return EOPNOTSUPP. This is only temporary, I'm going back to implement ACL's, but Chris wants to push out a release so this will suffice for now. Also Yan suggested setting reada to -1 in the delete case to enable backwards readahead, and in the listxattr case I moved path->reada = 2; to after the if (!path) check so we can avoid a possible null dereference. Thank you, Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r--fs/btrfs/xattr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index f4ac5e0bbad1..984616cca254 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -302,9 +302,9 @@ ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
key.offset = 0;
path = btrfs_alloc_path();
- path->reada = 2;
if (!path)
return -ENOMEM;
+ path->reada = 2;
mutex_lock(&root->fs_info->fs_mutex);
@@ -410,7 +410,7 @@ int btrfs_delete_xattrs(struct btrfs_trans_handle *trans,
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
-
+ path->reada = -1;
key.objectid = inode->i_ino;
btrfs_set_key_type(&key, BTRFS_XATTR_ITEM_KEY);
key.offset = (u64)-1;