From b01f16000965e02b5a0c4428f0f17464f1252d30 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 17 May 2010 14:51:49 -0400
Subject: [PATCH] --- yaml --- r: 190962 b: refs/heads/master c:
 db19272edc93661835bf6ec9736cfd0754aa3c62 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/inode.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bd74c65f9f68..915a523fcb81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade275c4b6db98ae7b197cc7c6bdd73567a975c2
+refs/heads/master: db19272edc93661835bf6ec9736cfd0754aa3c62
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index 5b042fc46450..8e05e8a0ff8b 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -1528,6 +1528,11 @@ cifs_inode_needs_reval(struct inode *inode)
 	if (time_after_eq(jiffies, cifs_i->time + HZ))
 		return true;
 
+	/* hardlinked files w/ noserverino get "special" treatment */
+	if (!(CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) &&
+	    S_ISREG(inode->i_mode) && inode->i_nlink != 1)
+		return true;
+
 	return false;
 }