diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 17:24:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 17:24:54 (GMT) |
| commit | 8cbc95ee748741939222c3d38584a40c92bedcdd (patch) | |
| tree | 7fc4ace333ef68e6f17ef531138bf16b711def88 /fs/nfs/nfs4filelayout.h | |
| parent | ea44083a7081ac8d9cc84d49525e6041025a7a17 (diff) | |
| parent | c23266d532b4de796a346f57a66587c5db17d27e (diff) | |
| download | linux-fsl-qoriq-8cbc95ee748741939222c3d38584a40c92bedcdd.tar.xz | |
Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull more NFS client bugfixes from Trond Myklebust:
- Ensure that we match the 'sec=' mount flavour against the server list
- Fix the NFSv4 byte range locking in the presence of delegations
- Ensure that we conform to the NFSv4.1 spec w.r.t. freeing lock
stateids
- Fix a pNFS data server connection race
* tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFS4.1 Fix data server connection race
NFSv3: match sec= flavor against server list
NFSv4.1: Ensure that we free the lock stateid on the server
NFSv4: Convert nfs41_free_stateid to use an asynchronous RPC call
SUNRPC: Don't spam syslog with "Pseudoflavor not found" messages
NFSv4.x: Fix handling of partially delegated locks
Diffstat (limited to 'fs/nfs/nfs4filelayout.h')
| -rw-r--r-- | fs/nfs/nfs4filelayout.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4filelayout.h b/fs/nfs/nfs4filelayout.h index b8da955..235ff95 100644 --- a/fs/nfs/nfs4filelayout.h +++ b/fs/nfs/nfs4filelayout.h @@ -70,6 +70,8 @@ struct nfs4_pnfs_ds { struct list_head ds_addrs; struct nfs_client *ds_clp; atomic_t ds_count; + unsigned long ds_state; +#define NFS4DS_CONNECTING 0 /* ds is establishing connection */ }; struct nfs4_file_layout_dsaddr { |