diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-25 21:38:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-25 21:38:44 -0700 |
| commit | 2300fd67b4f29eec19addb15a8571837228f63fc (patch) | |
| tree | 5f2cfcc87f81ff9fa607ab45c1f0a9adf644cc76 /include | |
| parent | 86ec090e58fca1025676e775093a87ab699f7f4d (diff) | |
| parent | 7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01 (diff) | |
| download | linux-stable-2300fd67b4f29eec19addb15a8571837228f63fc.tar.gz linux-stable-2300fd67b4f29eec19addb15a8571837228f63fc.tar.bz2 linux-stable-2300fd67b4f29eec19addb15a8571837228f63fc.zip | |
Merge tag 'nfs-for-3.4-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
- Fix NFSv4 infinite loops on open(O_TRUNC)
- Fix an Oops and an infinite loop in the NFSv4 flock code
- Don't register the PipeFS filesystem until it has been set up
- Fix an Oops in nfs_try_to_update_request
- Don't reuse NFSv4 open owners: fixes a bad sequence id storm.
* tag 'nfs-for-3.4-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4: Keep dropped state owners on the LRU list for a while
NFSv4: Ensure that we don't drop a state owner more than once
NFSv4: Ensure we do not reuse open owner names
nfs: Enclose hostname in brackets when needed in nfs_do_root_mount
NFS: put open context on error in nfs_flush_multi
NFS: put open context on error in nfs_pagein_multi
NFSv4: Fix open(O_TRUNC) and ftruncate() error handling
NFSv4: Ensure that we check lock exclusive/shared type against open modes
NFSv4: Ensure that the LOCK code sets exception->inode
NFS: check for req==NULL in nfs_try_to_update_request cleanup
SUNRPC: register PipeFS file system after pernet sybsystem
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_xdr.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index bfd0d1bf6707..7ba3551a0414 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -312,6 +312,11 @@ struct nfs4_layoutreturn { int rpc_status; }; +struct stateowner_id { + __u64 create_time; + __u32 uniquifier; +}; + /* * Arguments to the open call. */ @@ -321,7 +326,7 @@ struct nfs_openargs { int open_flags; fmode_t fmode; __u64 clientid; - __u64 id; + struct stateowner_id id; union { struct { struct iattr * attrs; /* UNCHECKED, GUARDED */ |