redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

btrfs: return EPERM upon rmdir on a subvolume

Browse source 
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>
This commit is contained in:
David Sterba 2012-09-13 16:04:34 -06:00 committed by Chris Mason
parent ebb3dad435
commit b3ae244e71
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/btrfs/inode.c
View file

@ -3200,9 +3200,10 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
unsigned long nr = 0; unsigned long nr = 0;
if (inode->i_size > BTRFS_EMPTY_DIR_SIZE || if (inode->i_size > BTRFS_EMPTY_DIR_SIZE)
btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID)
return -ENOTEMPTY; return -ENOTEMPTY;
if (btrfs_ino(inode) == BTRFS_FIRST_FREE_OBJECTID)
return -EPERM;
trans = __unlink_start_trans(dir, dentry); trans = __unlink_start_trans(dir, dentry);
if (IS_ERR(trans)) if (IS_ERR(trans))