From: Jeff Mahoney <jeffm@suse.com>
Date: Mon, 30 Mar 2009 18:02:23 +0000 (-0400)
Subject: reiserfs: eliminate reiserfs_warning from uniqueness functions
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd7cb031efb1dd71cb731668e2f597d9e61acdcb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

reiserfs: eliminate reiserfs_warning from uniqueness functions

uniqueness2type and type2uniquness issue a warning when the value is
unknown. When called from reiserfs_warning, this causes a re-entrancy
problem and deadlocks on the error buffer lock.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 056e2a3b04e3..cf5407ee0f32 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -560,10 +560,8 @@ static inline int uniqueness2type(__u32 uniqueness)
 		return TYPE_DIRECT;
 	case V1_DIRENTRY_UNIQUENESS:
 		return TYPE_DIRENTRY;
-	default:
-		reiserfs_warning(NULL, "vs-500", "unknown uniqueness %d",
-				 uniqueness);
 	case V1_ANY_UNIQUENESS:
+	default:
 		return TYPE_ANY;
 	}
 }
@@ -580,9 +578,8 @@ static inline __u32 type2uniqueness(int type)
 		return V1_DIRECT_UNIQUENESS;
 	case TYPE_DIRENTRY:
 		return V1_DIRENTRY_UNIQUENESS;
-	default:
-		reiserfs_warning(NULL, "vs-501", "unknown type %d", type);
 	case TYPE_ANY:
+	default:
 		return V1_ANY_UNIQUENESS;
 	}
 }