aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2012-09-13 18:04:34 -0400
committerChris Mason <chris.mason@fusionio.com>2012-10-04 09:39:56 -0400
commitb3ae244e7174d981c09ad7a6a68e7909d600aaca (patch)
tree29ee1f6ce4b4e97c7d47b15036d2232e0b8f1325 /fs/btrfs/inode.c
parentebb3dad4353b94c12a5cffab4397727c19f088e5 (diff)
btrfs: return EPERM upon rmdir on a subvolume
A subvolume cannot be deleted via rmdir, but the error code ENOTEMPTY is confusing. Return EPERM instead, as this is not permitted. Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d41e467b4aa2..1c50f7c4f5ac 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3200,9 +3200,10 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
3200 struct btrfs_trans_handle *trans; 3200 struct btrfs_trans_handle *trans;
3201 unsigned long nr = 0; 3201 unsigned long nr = 0;
3202 3202
3203 if (inode->i_size > BTRFS_EMPTY_DIR_SIZE || 3203 if (inode->i_size > BTRFS_EMPTY_DIR_SIZE)
3204 btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID)
3205 return -ENOTEMPTY; 3204 return -ENOTEMPTY;
3205 if (btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID)
3206 return -EPERM;
3206 3207
3207 trans = __unlink_start_trans(dir, dentry); 3208 trans = __unlink_start_trans(dir, dentry);
3208 if (IS_ERR(trans)) 3209 if (IS_ERR(trans))