2 files changed, 8 insertions, 2 deletions

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index b4f85ebe1bd6..27bb841fafeb 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -22,6 +22,11 @@
 #include <linux/posix_acl_xattr.h>
 #include "ctree.h"
 #include "xattr.h"
+#ifndef is_owner_or_cap
+#define is_owner_or_cap(inode)  \
+        ((current->fsuid == (inode)->i_uid) || capable(CAP_FOWNER))
+#endif
+
 static int btrfs_xattr_set_acl(struct inode *inode, int type,
                                const void *value, size_t size)
 {
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c1ac0bcbb462..51fc06dc4a5d 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2322,15 +2322,16 @@ static int create_snapshot(struct btrfs_root *root, char *name, int namelen)
                 ret = -ENOMEM;
                 goto fail_unlock;
         }
-        pending_snapshot->name = kstrndup(name, namelen, GFP_NOFS);
+        pending_snapshot->name = kmalloc(namelen + 1, GFP_NOFS);
         if (!pending_snapshot->name) {
                 ret = -ENOMEM;
                 kfree(pending_snapshot);
                 goto fail_unlock;
         }
+        memcpy(pending_snapshot->name, name, namelen);
+        pending_snapshot->name[namelen] = '\0';
         trans = btrfs_start_transaction(root, 1);
         BUG_ON(!trans);
-
         pending_snapshot->root = root;
         list_add(&pending_snapshot->list,
                  &trans->transaction->pending_snapshots);