X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Fext4%2Fcrypto_policy.c;h=ad050698143fde483e9c5cddc5e32c88041a9b29;hb=c17488d06666153a14dd3f21bd10eba58383f6c1;hp=a640ec2c4b134a16a3bb374872a57643f12f3e60;hpb=ed14ee0eea8b6808025356cecc87a8007885263f;p=linux-2.6-microblaze.git

diff --git a/fs/ext4/crypto_policy.c b/fs/ext4/crypto_policy.c
index a640ec2c4b13..ad050698143f 100644
--- a/fs/ext4/crypto_policy.c
+++ b/fs/ext4/crypto_policy.c
@@ -150,7 +150,8 @@ int ext4_is_child_context_consistent_with_parent(struct inode *parent,
 
 	if ((parent == NULL) || (child == NULL)) {
 		pr_err("parent %p child %p\n", parent, child);
-		BUG_ON(1);
+		WARN_ON(1);	/* Should never happen */
+		return 0;
 	}
 	/* no restrictions if the parent directory is not encrypted */
 	if (!ext4_encrypted_inode(parent))