From d12df70265eff74107d20c4994514abfad9cf98b Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Tue, 12 Jun 2007 08:21:35 -0400
Subject: [PATCH] --- yaml --- r: 128400 b: refs/heads/master c:
 8a712645c3fbbf43293af8640af337b7cf1fef01 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cca5f7938348..4d777120b0fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5af3981c1878b0657b9babd2ef7ec98c2008cf2c
+refs/heads/master: 8a712645c3fbbf43293af8640af337b7cf1fef01
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 62a3a778d37d..1cabc1951b0e 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -1831,6 +1831,8 @@ int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int
 		namelen = strlen(vol_args.name);
 		if (namelen > BTRFS_VOL_NAME_MAX)
 			return -EINVAL;
+		if (strchr(vol_args.name, '/'))
+			return -EINVAL;
 		path = btrfs_alloc_path();
 		if (!path)
 			return -ENOMEM;