diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2011-07-26 16:28:29 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-08-19 13:25:34 -0400 |
| commit | 710b7216964d6455cf1b215c43b03a1a79008c7d (patch) | |
| tree | b0b356e3256ba52838a6373c4791721820d8fdaa /include | |
| parent | ab83fa4b49a54e6199b076b7d8c1808144e80f0d (diff) | |
| download | kernel_samsung_smdk4412-710b7216964d6455cf1b215c43b03a1a79008c7d.zip kernel_samsung_smdk4412-710b7216964d6455cf1b215c43b03a1a79008c7d.tar.gz kernel_samsung_smdk4412-710b7216964d6455cf1b215c43b03a1a79008c7d.tar.bz2 | |
locks: move F_INPROGRESS from fl_type to fl_flags field
F_INPROGRESS isn't exposed to userspace. To me it makes more sense in
fl_flags....
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/fcntl.h | 5 | ||||
| -rw-r--r-- | include/linux/fs.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index 84793c7..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 */ diff --git a/include/linux/fs.h b/include/linux/fs.h index 178cdb4..327fdd4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1065,6 +1065,7 @@ static inline int file_check_writeable(struct file *filp) #define FL_LEASE 32 /* lease held on this file */ #define FL_CLOSE 64 /* unlock on close */ #define FL_SLEEP 128 /* A blocking lock */ +#define FL_INPROGRESS 256 /* Lease is being broken */ /* * Special return value from posix_lock_file() and vfs_lock_file() for @@ -1111,7 +1112,7 @@ struct file_lock { struct list_head fl_link; /* doubly linked list of all locks */ struct list_head fl_block; /* circular list of blocked processes */ fl_owner_t fl_owner; - unsigned char fl_flags; + unsigned int fl_flags; unsigned char fl_type; unsigned int fl_pid; struct pid *fl_nspid; |