[lkml]   [2015]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subject[GIT PULL] please pull file-locking related changes for v3.20
The following changes since commit cb59670870d90ff8bc31f5f2efc407c6fe4938c0:

Merge branch 'for-linus' of git:// (2015-01-16 14:58:16 +1300)

are available in the git repository at:

git:// tags/locks-v3.20-1

for you to fetch changes up to 8116bf4cb62d337c953cfa5369ef4cf83e73140c:

locks: update comments that refer to inode->i_flock (2015-01-21 20:44:01 -0500)

File locking related changes for v3.20 (pile #1)

This patchset contains a fairly major overhaul of how file locks are
tracked within the inode. Rather than a single list, we now create a
per-inode "lock context" that contains individual lists for the file
locks, and a new dedicated spinlock for them.

There are changes in other trees that are based on top of this set so
it may be easiest to pull this in early.
Jeff Layton (13):
locks: add new struct list_head to struct file_lock
locks: have locks_release_file use flock_lock_file to release generic flock locks
locks: add a new struct file_locking_context pointer to struct inode
ceph: move spinlocking into ceph_encode_locks_to_buffer and ceph_count_locks
locks: move flock locks to file_lock_context
locks: convert posix locks to file_lock_context
locks: convert lease handling to file_lock_context
locks: remove i_flock field from struct inode
locks: add a dedicated spinlock to protect i_flctx lists
locks: clean up the lm_change prototype
locks: keep a count of locks on the flctx lists
locks: consolidate NULL i_flctx checks in locks_remove_file
locks: update comments that refer to inode->i_flock

fs/ceph/locks.c | 64 ++++----
fs/ceph/mds_client.c | 4 -
fs/cifs/file.c | 34 ++---
fs/inode.c | 3 +-
fs/lockd/svcsubs.c | 26 ++--
fs/locks.c | 569 +++++++++++++++++++++++++++++++++++++-------------------------------
fs/nfs/delegation.c | 23 +--
fs/nfs/nfs4state.c | 70 +++++----
fs/nfs/pagelist.c | 6 +-
fs/nfs/write.c | 41 ++++-
fs/nfsd/nfs4state.c | 21 ++-
fs/read_write.c | 2 +-
include/linux/fs.h | 52 +++++--
13 files changed, 510 insertions(+), 405 deletions(-)

Jeff Layton <>

 \ /
  Last update: 2015-02-09 12:01    [W:0.055 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site