diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-30 17:21:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-30 17:21:41 -0400 |
| commit | 72c23f0819977d37924af92a42a9b7fbfd1c95d8 (patch) | |
| tree | a0c10114d96c40f8e38887c346ec593a51321781 /fs/nfs/client.c | |
| parent | 3fc3edf141fd78f624194eb89d7b37ff86138422 (diff) | |
| parent | d1f456b0b9545f1606a54cd17c20775f159bd2ce (diff) | |
| download | op-kernel-dev-72c23f0819977d37924af92a42a9b7fbfd1c95d8.zip op-kernel-dev-72c23f0819977d37924af92a42a9b7fbfd1c95d8.tar.gz | |
Merge branch 'bugfixes' into linux-next
* bugfixes:
NFSv4.1: Fix an NFSv4.1 state renewal regression
NFSv4: fix open/lock state recovery error handling
NFSv4: Fix lock recovery when CREATE_SESSION/SETCLIENTID_CONFIRM fails
NFS: Fabricate fscache server index key correctly
SUNRPC: Add missing support for RPC_CLNT_CREATE_NO_RETRANS_TIMEOUT
nfs: fix duplicate proc entries
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 8052020..f9f4845 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1320,7 +1320,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)); } |
