From: Namhyung Kim <namhyung@gmail.com>
Date: Mon, 11 Oct 2010 13:38:00 +0000 (+0900)
Subject: lockdep: fixup checking of dir inode annotation
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a3314a0ed389f51a51695120b429eccd45b3a165;p=linux-beck.git

lockdep: fixup checking of dir inode annotation

Since inode->i_mode shares its bits for S_IFMT, S_ISDIR should be
used to distinguish whether it is a dir or not.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/inode.c b/fs/inode.c
index 3368abd64bb5..4f0a67c54f89 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -663,7 +663,7 @@ EXPORT_SYMBOL(new_inode);
 void unlock_new_inode(struct inode *inode)
 {
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
-	if (inode->i_mode & S_IFDIR) {
+	if (S_ISDIR(inode->i_mode)) {
 		struct file_system_type *type = inode->i_sb->s_type;
 
 		/* Set new key only if filesystem hasn't already changed it */