[GIT PULL] please pull file locking related changes for v4.1

From: Jeff Layton
Date: Wed Apr 15 2015 - 11:53:00 EST

The following changes since commit 8f778bbc542ddf8f6243b21d6aca087e709cabdc:

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2015-04-02 17:18:57 -0700)

are available in the git repository at:

git://git.samba.org/jlayton/linux.git tags/locks-v4.1-1

for you to fetch changes up to 0429c2b5c1c4c8ba6cd563c1964baf3ed238df26:

locks: use cmpxchg to assign i_flctx pointer (2015-04-03 09:04:04 -0400)

File locking related changes for v4.1 (pile #1)

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.

Daniel Wagner (2):
locks: Remove unnecessary IS_POSIX test
locks: Add lockdep assertion for blocked_lock_lock

Jeff Layton (5):
locks: remove extraneous IS_POSIX and IS_FLOCK tests
locks: don't allocate a lock context for an F_UNLCK request
locks: change lm_get_owner and lm_put_owner prototypes
locks: get rid of WE_CAN_BREAK_LSLK_NOW dead code
locks: use cmpxchg to assign i_flctx pointer

fs/locks.c | 56 +++++++++++++++++++++++++++-----------------------------
fs/nfsd/nfs4state.c | 18 ++++++++++--------
include/linux/fs.h | 4 ++--
3 files changed, 39 insertions(+), 39 deletions(-)

Jeff Layton <jlayton@xxxxxxxxxxxxxxx>

Attachment: pgpwD75Sodqoq.pgp
Description: OpenPGP digital signature