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 /net/netfilter/xt_NFLOG.c | |
| parent | eccd02f32a2c25139da2d5e72ebab1fee7b5baab (diff) | |
| parent | 0429c2b5c1c4c8ba6cd563c1964baf3ed238df26 (diff) | |
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 'net/netfilter/xt_NFLOG.c')
0 files changed, 0 insertions, 0 deletions