From: Greg Kroah-Hartman Date: Mon, 5 Nov 2012 15:37:04 +0000 (+0100) Subject: 3.0-stable patches X-Git-Tag: v3.0.52~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2141fdaf9d4317670186d43000633a7959710bf0;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: nfs-fix-bug-in-legacy-dns-resolver.patch nfs-show-original-device-name-verbatim-in-proc-mount-s-info.patch nfsv3-make-v3-mounts-fail-with-etimedouts-instead-eio-on-mountd-timeouts.patch nfsv4-nfs4_locku_done-must-release-the-sequence-id.patch --- diff --git a/queue-3.0/nfs-fix-bug-in-legacy-dns-resolver.patch b/queue-3.0/nfs-fix-bug-in-legacy-dns-resolver.patch new file mode 100644 index 00000000000..d565608f05b --- /dev/null +++ b/queue-3.0/nfs-fix-bug-in-legacy-dns-resolver.patch @@ -0,0 +1,56 @@ +From 8d96b10639fb402357b75b055b1e82a65ff95050 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Wed, 31 Oct 2012 12:16:01 +1100 +Subject: NFS: fix bug in legacy DNS resolver. + +From: NeilBrown + +commit 8d96b10639fb402357b75b055b1e82a65ff95050 upstream. + +The DNS resolver's use of the sunrpc cache involves a 'ttl' number +(relative) rather that a timeout (absolute). This confused me when +I wrote + commit c5b29f885afe890f953f7f23424045cdad31d3e4 + "sunrpc: use seconds since boot in expiry cache" + +and I managed to break it. The effect is that any TTL is interpreted +as 0, and nothing useful gets into the cache. + +This patch removes the use of get_expiry() - which really expects an +expiry time - and uses get_uint() instead, treating the int correctly +as a ttl. + +This fixes a regression that has been present since 2.6.37, causing +certain NFS accesses in certain environments to incorrectly fail. + +Reported-by: Chuck Lever +Tested-by: Chuck Lever +Signed-off-by: NeilBrown +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfs/dns_resolve.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/fs/nfs/dns_resolve.c ++++ b/fs/nfs/dns_resolve.c +@@ -213,7 +213,7 @@ static int nfs_dns_parse(struct cache_de + { + char buf1[NFS_DNS_HOSTNAME_MAXLEN+1]; + struct nfs_dns_ent key, *item; +- unsigned long ttl; ++ unsigned int ttl; + ssize_t len; + int ret = -EINVAL; + +@@ -236,7 +236,8 @@ static int nfs_dns_parse(struct cache_de + key.namelen = len; + memset(&key.h, 0, sizeof(key.h)); + +- ttl = get_expiry(&buf); ++ if (get_uint(&buf, &ttl) < 0) ++ goto out; + if (ttl == 0) + goto out; + key.h.expiry_time = ttl + seconds_since_boot(); diff --git a/queue-3.0/nfs-show-original-device-name-verbatim-in-proc-mount-s-info.patch b/queue-3.0/nfs-show-original-device-name-verbatim-in-proc-mount-s-info.patch new file mode 100644 index 00000000000..e00399d87e6 --- /dev/null +++ b/queue-3.0/nfs-show-original-device-name-verbatim-in-proc-mount-s-info.patch @@ -0,0 +1,128 @@ +From 97a54868262da1629a3e65121e65b8e8c4419d9f Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 21 Oct 2012 19:23:52 +0100 +Subject: nfs: Show original device name verbatim in /proc/*/mount{s,info} + +From: Ben Hutchings + +commit 97a54868262da1629a3e65121e65b8e8c4419d9f upstream. + +Since commit c7f404b ('vfs: new superblock methods to override +/proc/*/mount{s,info}'), nfs_path() is used to generate the mounted +device name reported back to userland. + +nfs_path() always generates a trailing slash when the given dentry is +the root of an NFS mount, but userland may expect the original device +name to be returned verbatim (as it used to be). Make this +canonicalisation optional and change the callers accordingly. + +[jrnieder@gmail.com: use flag instead of bool argument] +Reported-and-tested-by: Chris Hiestand +Reference: http://bugs.debian.org/669314 +Signed-off-by: Ben Hutchings +Signed-off-by: Jonathan Nieder +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfs/internal.h | 5 +++-- + fs/nfs/namespace.c | 19 ++++++++++++++----- + fs/nfs/nfs4namespace.c | 3 ++- + fs/nfs/super.c | 2 +- + 4 files changed, 20 insertions(+), 9 deletions(-) + +--- a/fs/nfs/internal.h ++++ b/fs/nfs/internal.h +@@ -274,8 +274,9 @@ extern void nfs_sb_active(struct super_b + extern void nfs_sb_deactive(struct super_block *sb); + + /* namespace.c */ ++#define NFS_PATH_CANONICAL 1 + extern char *nfs_path(char **p, struct dentry *dentry, +- char *buffer, ssize_t buflen); ++ char *buffer, ssize_t buflen, unsigned flags); + extern struct vfsmount *nfs_d_automount(struct path *path); + + /* getroot.c */ +@@ -349,7 +350,7 @@ static inline char *nfs_devname(struct d + char *buffer, ssize_t buflen) + { + char *dummy; +- return nfs_path(&dummy, dentry, buffer, buflen); ++ return nfs_path(&dummy, dentry, buffer, buflen, NFS_PATH_CANONICAL); + } + + /* +--- a/fs/nfs/namespace.c ++++ b/fs/nfs/namespace.c +@@ -37,6 +37,7 @@ static struct vfsmount *nfs_do_submount( + * @dentry - pointer to dentry + * @buffer - result buffer + * @buflen - length of buffer ++ * @flags - options (see below) + * + * Helper function for constructing the server pathname + * by arbitrary hashed dentry. +@@ -44,8 +45,14 @@ static struct vfsmount *nfs_do_submount( + * This is mainly for use in figuring out the path on the + * server side when automounting on top of an existing partition + * and in generating /proc/mounts and friends. ++ * ++ * Supported flags: ++ * NFS_PATH_CANONICAL: ensure there is exactly one slash after ++ * the original device (export) name ++ * (if unset, the original name is returned verbatim) + */ +-char *nfs_path(char **p, struct dentry *dentry, char *buffer, ssize_t buflen) ++char *nfs_path(char **p, struct dentry *dentry, char *buffer, ssize_t buflen, ++ unsigned flags) + { + char *end; + int namelen; +@@ -78,7 +85,7 @@ rename_retry: + rcu_read_unlock(); + goto rename_retry; + } +- if (*end != '/') { ++ if ((flags & NFS_PATH_CANONICAL) && *end != '/') { + if (--buflen < 0) { + spin_unlock(&dentry->d_lock); + rcu_read_unlock(); +@@ -95,9 +102,11 @@ rename_retry: + return end; + } + namelen = strlen(base); +- /* Strip off excess slashes in base string */ +- while (namelen > 0 && base[namelen - 1] == '/') +- namelen--; ++ if (flags & NFS_PATH_CANONICAL) { ++ /* Strip off excess slashes in base string */ ++ while (namelen > 0 && base[namelen - 1] == '/') ++ namelen--; ++ } + buflen -= namelen; + if (buflen < 0) { + spin_unlock(&dentry->d_lock); +--- a/fs/nfs/nfs4namespace.c ++++ b/fs/nfs/nfs4namespace.c +@@ -57,7 +57,8 @@ Elong: + static char *nfs4_path(struct dentry *dentry, char *buffer, ssize_t buflen) + { + char *limit; +- char *path = nfs_path(&limit, dentry, buffer, buflen); ++ char *path = nfs_path(&limit, dentry, buffer, buflen, ++ NFS_PATH_CANONICAL); + if (!IS_ERR(path)) { + char *colon = strchr(path, ':'); + if (colon && colon < limit) +--- a/fs/nfs/super.c ++++ b/fs/nfs/super.c +@@ -763,7 +763,7 @@ static int nfs_show_devname(struct seq_f + int err = 0; + if (!page) + return -ENOMEM; +- devname = nfs_path(&dummy, mnt->mnt_root, page, PAGE_SIZE); ++ devname = nfs_path(&dummy, mnt->mnt_root, page, PAGE_SIZE, 0); + if (IS_ERR(devname)) + err = PTR_ERR(devname); + else diff --git a/queue-3.0/nfsv3-make-v3-mounts-fail-with-etimedouts-instead-eio-on-mountd-timeouts.patch b/queue-3.0/nfsv3-make-v3-mounts-fail-with-etimedouts-instead-eio-on-mountd-timeouts.patch new file mode 100644 index 00000000000..601d2a36bcb --- /dev/null +++ b/queue-3.0/nfsv3-make-v3-mounts-fail-with-etimedouts-instead-eio-on-mountd-timeouts.patch @@ -0,0 +1,38 @@ +From acce94e68a0f346115fd41cdc298197d2d5a59ad Mon Sep 17 00:00:00 2001 +From: Scott Mayhew +Date: Tue, 16 Oct 2012 13:22:19 -0400 +Subject: nfsv3: Make v3 mounts fail with ETIMEDOUTs instead EIO on mountd timeouts + +From: Scott Mayhew + +commit acce94e68a0f346115fd41cdc298197d2d5a59ad upstream. + +In very busy v3 environment, rpc.mountd can respond to the NULL +procedure but not the MNT procedure in a timely manner causing +the MNT procedure to time out. The problem is the mount system +call returns EIO which causes the mount to fail, instead of +ETIMEDOUT, which would cause the mount to be retried. + +This patch sets the RPC_TASK_SOFT|RPC_TASK_TIMEOUT flags to +the rpc_call_sync() call in nfs_mount() which causes +ETIMEDOUT to be returned on timed out connections. + +Signed-off-by: Steve Dickson +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfs/mount_clnt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/nfs/mount_clnt.c ++++ b/fs/nfs/mount_clnt.c +@@ -181,7 +181,7 @@ int nfs_mount(struct nfs_mount_request * + else + msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT]; + +- status = rpc_call_sync(mnt_clnt, &msg, 0); ++ status = rpc_call_sync(mnt_clnt, &msg, RPC_TASK_SOFT|RPC_TASK_TIMEOUT); + rpc_shutdown_client(mnt_clnt); + + if (status < 0) diff --git a/queue-3.0/nfsv4-nfs4_locku_done-must-release-the-sequence-id.patch b/queue-3.0/nfsv4-nfs4_locku_done-must-release-the-sequence-id.patch new file mode 100644 index 00000000000..fddbdbb8463 --- /dev/null +++ b/queue-3.0/nfsv4-nfs4_locku_done-must-release-the-sequence-id.patch @@ -0,0 +1,29 @@ +From 2b1bc308f492589f7d49012ed24561534ea2be8c Mon Sep 17 00:00:00 2001 +From: Trond Myklebust +Date: Mon, 29 Oct 2012 18:53:23 -0400 +Subject: NFSv4: nfs4_locku_done must release the sequence id + +From: Trond Myklebust + +commit 2b1bc308f492589f7d49012ed24561534ea2be8c upstream. + +If the state recovery machinery is triggered by the call to +nfs4_async_handle_error() then we can deadlock. + +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + fs/nfs/nfs4proc.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -4116,6 +4116,7 @@ static void nfs4_locku_done(struct rpc_t + nfs_restart_rpc(task, + calldata->server->nfs_client); + } ++ nfs_release_seqid(calldata->arg.seqid); + } + + static void nfs4_locku_prepare(struct rpc_task *task, void *data) diff --git a/queue-3.0/series b/queue-3.0/series index fa9583c8738..efd3c57d32c 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -7,3 +7,7 @@ mac80211-don-t-inspect-sequence-control-field-on-control-frames.patch drm-radeon-fix-load-detection-on-legacy-primary-dac.patch mac80211-check-management-frame-header-length.patch mac80211-fix-ssid-copy-on-ibss-join.patch +nfsv3-make-v3-mounts-fail-with-etimedouts-instead-eio-on-mountd-timeouts.patch +nfs-show-original-device-name-verbatim-in-proc-mount-s-info.patch +nfsv4-nfs4_locku_done-must-release-the-sequence-id.patch +nfs-fix-bug-in-legacy-dns-resolver.patch