From d248ef3cc355ea9de4d2bda1f6d7d0bf1ff02351 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 6 Mar 2012 10:14:35 -0500
Subject: [PATCH] --- yaml --- r: 294522 b: refs/heads/master c:
 fa68a1ba1de349f0d1fcc54171b95236efe24148 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ff198e75b690..32dba8066d9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e03b7cc0736eefe7471782c344112ad6eba951e
+refs/heads/master: fa68a1ba1de349f0d1fcc54171b95236efe24148
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 99a4f52c14b2..ba03b7908149 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -1058,7 +1058,7 @@ void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption)
 {
 	unsigned short i;
 
-	if (fh->size == 0 || fh == NULL) {
+	if (fh == NULL || fh->size == 0) {
 		printk(KERN_DEFAULT "%s at %p is empty\n", caption, fh);
 		return;
 	}