2 files changed, 20 insertions, 2 deletions

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index aee9f0657c35..889ba89d3f9f 100644
--- a/fs/btrfs/acl.c
+++ b/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/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;