Skip to content

Commit

Permalink
btrfs: return EPERM upon rmdir on a subvolume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Sterba authored and Chris Mason committed Oct 4, 2012
1 parent ebb3dad commit b3ae244
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit b3ae244

Please sign in to comment.