diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 15:42:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 15:42:01 +0200 |
| commit | 1442d1678ca7e53574fd403ba7bee6f4125d920c (patch) | |
| tree | fd053a849158d2c5b8345ced8982108825b85736 /include/asm-generic | |
| parent | 7e0bb71e75020348bee523720a0c2f04cc72f540 (diff) | |
| parent | 345c284290cabb5484df909303e73d6def8ec8ec (diff) | |
| download | op-kernel-dev-1442d1678ca7e53574fd403ba7bee6f4125d920c.zip op-kernel-dev-1442d1678ca7e53574fd403ba7bee6f4125d920c.tar.gz | |
Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux
* 'for-3.2' of git://linux-nfs.org/~bfields/linux: (103 commits)
nfs41: implement DESTROY_CLIENTID operation
nfsd4: typo logical vs bitwise negate for want_mask
nfsd4: allow NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL | NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED
nfsd4: seq->status_flags may be used unitialized
nfsd41: use SEQ4_STATUS_BACKCHANNEL_FAULT when cb_sequence is invalid
nfsd4: implement new 4.1 open reclaim types
nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaround
nfsd4: warn on open failure after create
nfsd4: preallocate open stateid in process_open1()
nfsd4: do idr preallocation with stateid allocation
nfsd4: preallocate nfs4_file in process_open1()
nfsd4: clean up open owners on OPEN failure
nfsd4: simplify process_open1 logic
nfsd4: make is_open_owner boolean
nfsd4: centralize renew_client() calls
nfsd4: typo logical vs bitwise negate
nfs: fix bug about IPv6 address scope checking
nfsd4: more robust ignoring of WANT bits in OPEN
nfsd4: move name-length checks to xdr
nfsd4: move access/deny validity checks to xdr code
...
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/fcntl.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index 84793c70..9e5b035 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h @@ -145,11 +145,6 @@ struct f_owner_ex { #define F_SHLCK 8 /* or 4 */ #endif -/* for leases */ -#ifndef F_INPROGRESS -#define F_INPROGRESS 16 -#endif - /* operations for bsd flock(), also used by the kernel implementation */ #define LOCK_SH 1 /* shared lock */ #define LOCK_EX 2 /* exclusive lock */ |
