git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
btrfs: Allow rmdir(2) to delete an empty subvolume
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
inode.c
diff --git
a/fs/btrfs/inode.c
b/fs/btrfs/inode.c
index 6e03e7991a5dec33cfd86d3a2d4002c589cb5798..d722a30b0b74fb69b525869bd168da19d3998297 100644
(file)
--- a/
fs/btrfs/inode.c
+++ b/
fs/btrfs/inode.c
@@
-4531,7
+4531,7
@@
static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
if (inode->i_size > BTRFS_EMPTY_DIR_SIZE)
return -ENOTEMPTY;
if (btrfs_ino(BTRFS_I(inode)) == BTRFS_FIRST_FREE_OBJECTID)
- return
-EPERM
;
+ return
btrfs_delete_subvolume(dir, dentry)
;
trans = __unlink_start_trans(dir);
if (IS_ERR(trans))