summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-07-26 16:28:29 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-08-19 13:25:34 -0400
commit710b7216964d6455cf1b215c43b03a1a79008c7d (patch)
treeb0b356e3256ba52838a6373c4791721820d8fdaa /include/asm-generic
parentab83fa4b49a54e6199b076b7d8c1808144e80f0d (diff)
downloadlinux-710b7216964d6455cf1b215c43b03a1a79008c7d.tar.gz
linux-710b7216964d6455cf1b215c43b03a1a79008c7d.tar.bz2
linux-710b7216964d6455cf1b215c43b03a1a79008c7d.zip
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/asm-generic')
-rw-r--r--include/asm-generic/fcntl.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index 84793c7025e2..9e5b0356e2bb 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 */