summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2013-07-04 14:38:48 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-21 18:21:21 -0700
commitcfe24e4e36ec19a56bac17691f8721ac44050a6f (patch)
treeac690dbe464d5642034ab9419198a494a0841d4c /fs
parentcb5d8be972cfbea114ea56fd63ed5ce1644863df (diff)
downloadlinux-3.10-cfe24e4e36ec19a56bac17691f8721ac44050a6f.tar.gz
linux-3.10-cfe24e4e36ec19a56bac17691f8721ac44050a6f.tar.bz2
linux-3.10-cfe24e4e36ec19a56bac17691f8721ac44050a6f.zip
CIFS use sensible file nlink values if unprovided
commit 6658b9f70ebca5fc0795b1d6d733996af1e2caa7 upstream. Certain servers may not set the NumberOfLinks field in query file/path info responses. In such a case, cifs_inode_needs_reval() assumes that all regular files are hardlinks and triggers revalidation, leading to excessive and unnecessary network traffic. This change hardcodes cf_nlink (and subsequently i_nlink) when not returned by the server, similar to what already occurs in cifs_mkdir(). Signed-off-by: David Disseldorp <ddiss@suse.de> Signed-off-by: Steve French <smfrench@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/inode.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 20efd81266c..449b6cf09b0 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -558,6 +558,11 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info,
fattr->cf_mode &= ~(S_IWUGO);
fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
+ if (fattr->cf_nlink < 1) {
+ cifs_dbg(1, "replacing bogus file nlink value %u\n",
+ fattr->cf_nlink);
+ fattr->cf_nlink = 1;
+ }
}
fattr->cf_uid = cifs_sb->mnt_uid;