diff --git a/[refs] b/[refs]
index 5632352a8a5f..d55a24b802f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d018b6f4f1539f3679fbdc2d02d58d09e76be84a
+refs/heads/master: 6f7f7caab259026234277b659485d22c1dcb1ab4
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 0c6d5c549d84..274a22250380 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -1357,8 +1357,8 @@ EXPORT_SYMBOL(d_alloc_name);
 
 void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op)
 {
-	BUG_ON(dentry->d_op);
-	BUG_ON(dentry->d_flags & (DCACHE_OP_HASH	|
+	WARN_ON_ONCE(dentry->d_op);
+	WARN_ON_ONCE(dentry->d_flags & (DCACHE_OP_HASH	|
 				DCACHE_OP_COMPARE	|
 				DCACHE_OP_REVALIDATE	|
 				DCACHE_OP_DELETE ));