From f02d442ae343d5977b5e816b3eebf1100b4a6b27 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 13 Sep 2012 16:04:34 -0600 Subject: [PATCH] --- yaml --- r: 332570 b: refs/heads/master c: b3ae244e7174d981c09ad7a6a68e7909d600aaca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9d68cca3796..a7b4eb0f5be1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebb3dad4353b94c12a5cffab4397727c19f088e5 +refs/heads/master: b3ae244e7174d981c09ad7a6a68e7909d600aaca diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index d41e467b4aa2..1c50f7c4f5ac 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -3200,9 +3200,10 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) struct btrfs_trans_handle *trans; unsigned long nr = 0; - if (inode->i_size > BTRFS_EMPTY_DIR_SIZE || - btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID) + if (inode->i_size > BTRFS_EMPTY_DIR_SIZE) return -ENOTEMPTY; + if (btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID) + return -EPERM; trans = __unlink_start_trans(dir, dentry); if (IS_ERR(trans))