From a420cbf56bd6ef76b9570460d34563037e55167e Mon Sep 17 00:00:00 2001
From: Julien Brunel <brunel@diku.dk>
Date: Wed, 15 Oct 2008 22:04:12 -0700
Subject: [PATCH] --- yaml --- r: 114887 b: refs/heads/master c:
 67b172c097177835fbf5b0666885c4059a4f67ff h: refs/heads/master i:   114885:
 3024f1c59a342c9f21046bee5df67467a22fee78   114883:
 5bffa9496b8f4f07df7c69863ddc968c58eaabfe   114879:
 17bbd3f4274f1c8cfc1e3900fdd57fc9e62e0d2e v: v3

---
 [refs]                    | 2 +-
 trunk/fs/reiserfs/xattr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab7d35fc6832..01a158251fab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b23ea7679978e6e1148aae9245021dfbcd989d7
+refs/heads/master: 67b172c097177835fbf5b0666885c4059a4f67ff
diff --git a/trunk/fs/reiserfs/xattr.c b/trunk/fs/reiserfs/xattr.c
index bb3cb5b7cdb2..ad92461cbfc3 100644
--- a/trunk/fs/reiserfs/xattr.c
+++ b/trunk/fs/reiserfs/xattr.c
@@ -155,7 +155,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
 	xadir = open_xa_dir(inode, flags);
 	if (IS_ERR(xadir)) {
 		return ERR_CAST(xadir);
-	} else if (xadir && !xadir->d_inode) {
+	} else if (!xadir->d_inode) {
 		dput(xadir);
 		return ERR_PTR(-ENODATA);
 	}