diff options
| author | David Sterba <dsterba@suse.cz> | 2012-09-13 16:04:34 -0600 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-04 09:39:56 -0400 |
| commit | b3ae244e7174d981c09ad7a6a68e7909d600aaca (patch) | |
| tree | 29ee1f6ce4b4e97c7d47b15036d2232e0b8f1325 | |
| parent | ebb3dad4353b94c12a5cffab4397727c19f088e5 (diff) | |
| download | blackbird-op-linux-b3ae244e7174d981c09ad7a6a68e7909d600aaca.tar.gz blackbird-op-linux-b3ae244e7174d981c09ad7a6a68e7909d600aaca.zip | |
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>
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
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) 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)) |
