diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 14:22:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 14:22:45 -0700 |
| commit | 6d50ff91d9780263160262daeb6adfdda8ddbc6c (patch) | |
| tree | e8e56a75dc03ac71bdfffcf1b97eebd6720e1580 /include | |
| parent | crypto: fix mis-merge with the networking merge (diff) | |
| parent | locks: use cmpxchg to assign i_flctx pointer (diff) | |
| download | linux-dev-6d50ff91d9780263160262daeb6adfdda8ddbc6c.tar.xz linux-dev-6d50ff91d9780263160262daeb6adfdda8ddbc6c.zip | |
Merge tag 'locks-v4.1-1' of git://git.samba.org/jlayton/linux
Pull file locking related changes from Jeff Layton:
"This set is mostly minor cleanups to the overhaul that went in last
cycle. The other noticeable items are the changes to the lm_get_owner
and lm_put_owner prototypes, and the fact that we no longer need to
use the i_lock to protect the i_flctx pointer"
* tag 'locks-v4.1-1' of git://git.samba.org/jlayton/linux:
locks: use cmpxchg to assign i_flctx pointer
locks: get rid of WE_CAN_BREAK_LSLK_NOW dead code
locks: change lm_get_owner and lm_put_owner prototypes
locks: don't allocate a lock context for an F_UNLCK request
locks: Add lockdep assertion for blocked_lock_lock
locks: remove extraneous IS_POSIX and IS_FLOCK tests
locks: Remove unnecessary IS_POSIX test
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 4d9acc91de12..90a1207231ea 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -915,8 +915,8 @@ struct file_lock_operations { struct lock_manager_operations { int (*lm_compare_owner)(struct file_lock *, struct file_lock *); unsigned long (*lm_owner_key)(struct file_lock *); - void (*lm_get_owner)(struct file_lock *, struct file_lock *); - void (*lm_put_owner)(struct file_lock *); + fl_owner_t (*lm_get_owner)(fl_owner_t); + void (*lm_put_owner)(fl_owner_t); void (*lm_notify)(struct file_lock *); /* unblock callback */ int (*lm_grant)(struct file_lock *, int); bool (*lm_break)(struct file_lock *); |