From d71f417a0c2265613bd588a0867a07fc2f284e69 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Mar 2012 19:26:42 +1100
Subject: [PATCH] --- yaml --- r: 294571 b: refs/heads/master c:
 9304a8120a6ac06d08874d2aec76f52d3376dfe4 h: refs/heads/master i:   294569:
 e2348b15034534310006be35ea0214d0523101de   294567:
 b0b12a05f51cb7b16e2be6c7db118865ff956a81 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/nfs_fs.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ad78dddc0c03..321c9feb51a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3b536a1230a14e3ef97e5331ba7ad036c6258a9
+refs/heads/master: 9304a8120a6ac06d08874d2aec76f52d3376dfe4
diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
index 8f27c2e36ddf..69ec9cb3a867 100644
--- a/trunk/include/linux/nfs_fs.h
+++ b/trunk/include/linux/nfs_fs.h
@@ -413,6 +413,7 @@ extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
 #else
 static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
 {
+	return 0;
 }
 static inline void nfs_display_fhandle(const struct nfs_fh *fh,
 				       const char *caption)