From 41876ccaa13575b35b8a7a1ec9e34b83252ccb22 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 25 Oct 2007 15:49:25 -0400 Subject: [PATCH] --- yaml --- r: 128514 b: refs/heads/master c: 134d45120164141c0847daf5222aaec77e04724a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7d2250ebce29..77ded6999f60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d9f7f3e27a92b07212090a1772fdbb3a92fef81 +refs/heads/master: 134d45120164141c0847daf5222aaec77e04724a diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index b74a831fab19..7e4b2c1b4a56 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -448,6 +448,9 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) char *goodnames = ".."; unsigned long nr; + if (inode->i_size > BTRFS_EMPTY_DIR_SIZE) + return -ENOTEMPTY; + path = btrfs_alloc_path(); BUG_ON(!path); mutex_lock(&root->fs_info->fs_mutex); @@ -501,9 +504,9 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) out: btrfs_release_path(root, path); btrfs_free_path(path); - mutex_unlock(&root->fs_info->fs_mutex); nr = trans->blocks_used; ret = btrfs_end_transaction(trans, root); + mutex_unlock(&root->fs_info->fs_mutex); btrfs_btree_balance_dirty(root, nr); if (ret && !err) err = ret;