diff --git a/[refs] b/[refs]
index b82b04c81c0f..eb57bebda131 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e2ce171c3ba6f2753fb1fd2706b63683394da2d
+refs/heads/master: 99cefda42ac550863b5ae1df9e60322e377decf9
diff --git a/trunk/fs/configfs/dir.c b/trunk/fs/configfs/dir.c
index 4d11479cf2c3..a89058b39884 100644
--- a/trunk/fs/configfs/dir.c
+++ b/trunk/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() */