The patch below does not apply to the 3.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 2f3169fb18f4643ac9a6a097a6a6c71f0b2cef75 Mon Sep 17 00:00:00 2001 From: Fabian Frederick <[email protected]> Date: Wed, 24 Sep 2014 18:56:11 +0200 Subject: [PATCH] nfs: fix duplicate proc entries Commit 65b38851a174 ("NFS: Fix /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumes") updated the following function: static int nfs_volume_list_open(struct inode *inode, struct file *file) it used &nfs_server_list_ops instead of &nfs_volume_list_ops which means cat /proc/fs/nfsfs/volumes = /proc/fs/nfsfs/servers Signed-off-by: Fabian Frederick <[email protected]> Fixes: 65b38851a174 (NFS: Fix /proc/fs/nfsfs/servers and...) Cc: [email protected] # 3.4.x+ Signed-off-by: Trond Myklebust <[email protected]> diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 6a4f3666e273..94088517039f 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1318,7 +1318,7 @@ static int nfs_server_list_show(struct seq_file *m, void *v) */ static int nfs_volume_list_open(struct inode *inode, struct file *file) { - return seq_open_net(inode, file, &nfs_server_list_ops, + return seq_open_net(inode, file, &nfs_volume_list_ops, sizeof(struct seq_net_private)); } -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
