]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jul 2013 16:57:27 +0000 (09:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jul 2013 16:57:27 +0000 (09:57 -0700)
added patches:
cifs-use-sensible-file-nlink-values-if-unprovided.patch

queue-3.4/cifs-use-sensible-file-nlink-values-if-unprovided.patch [new file with mode: 0644]
queue-3.4/series [new file with mode: 0644]

diff --git a/queue-3.4/cifs-use-sensible-file-nlink-values-if-unprovided.patch b/queue-3.4/cifs-use-sensible-file-nlink-values-if-unprovided.patch
new file mode 100644 (file)
index 0000000..2674fca
--- /dev/null
@@ -0,0 +1,39 @@
+From 6658b9f70ebca5fc0795b1d6d733996af1e2caa7 Mon Sep 17 00:00:00 2001
+From: Steve French <smfrench@gmail.com>
+Date: Thu, 4 Jul 2013 14:38:48 -0500
+Subject: CIFS use sensible file nlink values if unprovided
+
+From: Steve French <smfrench@gmail.com>
+
+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>
+
+---
+ fs/cifs/inode.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fs/cifs/inode.c
++++ b/fs/cifs/inode.c
+@@ -549,6 +549,11 @@ cifs_all_info_to_fattr(struct cifs_fattr
+                       fattr->cf_mode &= ~(S_IWUGO);
+               fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
++              if (fattr->cf_nlink < 1) {
++                      cFYI(1, "replacing bogus file nlink value %u\n",
++                           fattr->cf_nlink);
++                      fattr->cf_nlink = 1;
++              }
+       }
+       fattr->cf_uid = cifs_sb->mnt_uid;
diff --git a/queue-3.4/series b/queue-3.4/series
new file mode 100644 (file)
index 0000000..f1c5d1d
--- /dev/null
@@ -0,0 +1 @@
+cifs-use-sensible-file-nlink-values-if-unprovided.patch