| From 2f3169fb18f4643ac9a6a097a6a6c71f0b2cef75 Mon Sep 17 00:00:00 2001 |
| From: Fabian Frederick <fabf@skynet.be> |
| Date: Wed, 24 Sep 2014 18:56:11 +0200 |
| Subject: nfs: fix duplicate proc entries |
| |
| From: Fabian Frederick <fabf@skynet.be> |
| |
| commit 2f3169fb18f4643ac9a6a097a6a6c71f0b2cef75 upstream. |
| |
| 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 <fabf@skynet.be> |
| Fixes: 65b38851a174 (NFS: Fix /proc/fs/nfsfs/servers and...) |
| Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/client.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/nfs/client.c |
| +++ b/fs/nfs/client.c |
| @@ -1318,7 +1318,7 @@ static int nfs_server_list_show(struct s |
| */ |
| 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)); |
| } |
| |