summaryrefslogtreecommitdiff
path: root/fs/configfs
diff options
context:
space:
mode:
authorLouis Rilling <louis.rilling@kerlabs.com>2008-06-27 13:10:25 +0200
committerMark Fasheh <mfasheh@suse.com>2008-07-31 16:21:13 -0700
commit99cefda42ac550863b5ae1df9e60322e377decf9 (patch)
tree20926e04d7d5ff770edf337e0e4493a1b0b6a9cc /fs/configfs
parent2e2ce171c3ba6f2753fb1fd2706b63683394da2d (diff)
downloadlinux-3.10-99cefda42ac550863b5ae1df9e60322e377decf9.tar.gz
linux-3.10-99cefda42ac550863b5ae1df9e60322e377decf9.tar.bz2
linux-3.10-99cefda42ac550863b5ae1df9e60322e377decf9.zip
[PATCH] configfs: Fix open directory making rmdir() fail
When checking for user-created elements under an item to be removed by rmdir(), configfs_detach_prep() counts fake configfs_dirents created by dir_open() as user-created and fails when finding one. It is however perfectly valid to remove a directory that is open. Simply make configfs_detach_prep() skip fake configfs_dirent, like it already does for attributes, and like detach_groups() does. Signed-off-by: Louis Rilling <louis.rilling@kerlabs.com> Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/configfs')
-rw-r--r--fs/configfs/dir.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 4d11479cf2c..a89058b3988 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -435,7 +435,8 @@ static int configfs_detach_prep(struct dentry *dentry, struct mutex **wait_mutex
ret = 0;
list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
- if (sd->s_type & CONFIGFS_NOT_PINNED)
+ if (!sd->s_element ||
+ (sd->s_type & CONFIGFS_NOT_PINNED))
continue;
if (sd->s_type & CONFIGFS_USET_DEFAULT) {
/* Abort if racing with mkdir() */