From a8ade5501bb3a7979052d719646eb2b309f5f91b Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 10 Oct 2008 10:23:22 -0400
Subject: [PATCH] --- yaml --- r: 128978 b: refs/heads/master c:
 a3dddf3fc82a1f5942c0928abfd114e9a8c0d0c8 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c33193d1a775..cc852e7f9920 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb8e70901d36f32017614f16d2cf7cc089544574
+refs/heads/master: a3dddf3fc82a1f5942c0928abfd114e9a8c0d0c8
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 3d85f18bbba6..1136ce2febcc 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -254,11 +254,6 @@ static noinline int btrfs_mksubvol(struct path *parent, char *name,
 	if (error)
 		goto out_drop_write;
 
-	mode &= (S_IRWXUGO|S_ISVTX);
-	error = security_inode_mkdir(parent->dentry->d_inode, dentry, mode);
-	if (error)
-		goto out_drop_write;
-
 	/*
 	 * Actually perform the low-level subvolume creation after all
 	 * this VFS fuzz.