---

yaml --- r: 128543 b: refs/heads/master c: 1caf934 h: refs/heads/master i: 128541: 13cfc25 128539: bce0751 128535: a0cae0e 128527: 1e0d32d 128511: 6650f35 v: v3
git-mirror · Sep 25, 2008 · 8673ca6 · 8673ca6
1 parent d8e8ceb
commit 8673ca6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cf664263b05beb080bf95037e4c3bd50c80b096
+refs/heads/master: 1caf9342fc71d020e788a59598a44d4ea0136b36
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
@@ -23,32 +23,50 @@
 #include "ctree.h"
 #include "xattr.h"
 
+/*
+ * FIXME: At this point this is all place holder stuff, we just return
+ * -EOPNOTSUPP so cp won't complain when it tries to copy over a file with an
+ *  acl on it.
+ */
+
 static int btrfs_xattr_acl_access_get(struct inode *inode, const char *name,
 				      void *value, size_t size)
 {
+	/*
 	return btrfs_xattr_get(inode, BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS, name,
 			       value, size);
+	*/
+	return -EOPNOTSUPP;
 }
 
 static int btrfs_xattr_acl_access_set(struct inode *inode, const char *name,
 				      const void *value, size_t size, int flags)
 {
+	/*
 	return btrfs_xattr_set(inode, BTRFS_XATTR_INDEX_POSIX_ACL_ACCESS, name,
 			       value, size, flags);
+	*/
+	return -EOPNOTSUPP;
 }
 
 static int btrfs_xattr_acl_default_get(struct inode *inode, const char *name,
 				       void *value, size_t size)
 {
+	/*
 	return btrfs_xattr_get(inode, BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT,
 			       name, value, size);
+	*/
+	return -EOPNOTSUPP;
 }
 
 static int btrfs_xattr_acl_default_set(struct inode *inode, const char *name,
 				       const void *value, size_t size, int flags)
 {
+	/*
 	return btrfs_xattr_set(inode, BTRFS_XATTR_INDEX_POSIX_ACL_DEFAULT,
 			       name, value, size, flags);
+	*/
+	return -EOPNOTSUPP;
 }
 
 struct xattr_handler btrfs_xattr_acl_default_handler = {

diff --git a/trunk/fs/btrfs/xattr.c b/trunk/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;