From baf724b96d76e4d951e586dbc5d17d93daa3ab18 Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Mon, 22 Oct 2012 11:39:53 +0000
Subject: [PATCH] --- yaml --- r: 349157 b: refs/heads/master c:
 5c39da5b6ca23e68e7acea7f4c01470383475214 h: refs/heads/master i:   349155:
 6027dc35d0db4149d6e1ca2551738350bb74eaf5 v: v3

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

diff --git a/[refs] b/[refs]
index 9172baf02e0c..01352d50fb98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d86e56cf7d3669dd292012ac82b986bd1573b6cc
+refs/heads/master: 5c39da5b6ca23e68e7acea7f4c01470383475214
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index dd8e3448fe8f..5a72896bd769 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -2095,13 +2095,13 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
 		err = inode_permission(inode, MAY_WRITE | MAY_EXEC);
 		if (err)
 			goto out_dput;
-
-		/* check if subvolume may be deleted by a non-root user */
-		err = btrfs_may_delete(dir, dentry, 1);
-		if (err)
-			goto out_dput;
 	}
 
+	/* check if subvolume may be deleted by a user */
+	err = btrfs_may_delete(dir, dentry, 1);
+	if (err)
+		goto out_dput;
+
 	if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) {
 		err = -EINVAL;
 		goto out_dput;