Merge tag 'locks-v3.20-1' of git://git.samba.org/jlayton/linux

Pull file locking related changes #1 from Jeff Layton:
 "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"

* tag 'locks-v3.20-1' of git://git.samba.org/jlayton/linux:
  locks: update comments that refer to inode->i_flock
  locks: consolidate NULL i_flctx checks in locks_remove_file
  locks: keep a count of locks on the flctx lists
  locks: clean up the lm_change prototype
  locks: add a dedicated spinlock to protect i_flctx lists
  locks: remove i_flock field from struct inode
  locks: convert lease handling to file_lock_context
  locks: convert posix locks to file_lock_context
  locks: move flock locks to file_lock_context
  ceph: move spinlocking into ceph_encode_locks_to_buffer and ceph_count_locks
  locks: add a new struct file_locking_context pointer to struct inode
  locks: have locks_release_file use flock_lock_file to release generic flock locks
  locks: add new struct list_head to struct file_lock

1 files changed, 36 insertions, 16 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 42efe13077b6..ddd2fa7cefd3 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -625,7 +625,7 @@ struct inode {
         atomic_t                i_readcount; /* struct files open RO */
 #endif
         const struct file_operations    *i_fop; /* former ->i_op->default_file_ops */
-        struct file_lock        *i_flock;
+        struct file_lock_context        *i_flctx;
         struct address_space    i_data;
         struct list_head        i_devices;
         union {
@@ -885,6 +885,8 @@ static inline struct file *get_file(struct file *f)
 /* legacy typedef, should eventually be removed */
 typedef void *fl_owner_t;
 
+struct file_lock;
+
 struct file_lock_operations {
         void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
         void (*fl_release_private)(struct file_lock *);
@@ -898,7 +900,7 @@ struct lock_manager_operations {
         void (*lm_notify)(struct file_lock *);  /* unblock callback */
         int (*lm_grant)(struct file_lock *, int);
         bool (*lm_break)(struct file_lock *);
-        int (*lm_change)(struct file_lock **, int, struct list_head *);
+        int (*lm_change)(struct file_lock *, int, struct list_head *);
         void (*lm_setup)(struct file_lock *, void **);
 };
 
@@ -923,17 +925,17 @@ int locks_in_grace(struct net *);
  * FIXME: should we create a separate "struct lock_request" to help distinguish
  * these two uses?
  *
- * The i_flock list is ordered by:
+ * The varous i_flctx lists are ordered by:
  *
- * 1) lock type -- FL_LEASEs first, then FL_FLOCK, and finally FL_POSIX
- * 2) lock owner
- * 3) lock range start
- * 4) lock range end
+ * 1) lock owner
+ * 2) lock range start
+ * 3) lock range end
  *
  * Obviously, the last two criteria only matter for POSIX locks.
  */
 struct file_lock {
         struct file_lock *fl_next;      /* singly linked list for this inode  */
+        struct list_head fl_list;       /* link into file_lock_context */
         struct hlist_node fl_link;      /* node in global lists */
         struct list_head fl_block;      /* circular list of blocked processes */
         fl_owner_t fl_owner;
@@ -964,6 +966,16 @@ struct file_lock {
         } fl_u;
 };
 
+struct file_lock_context {
+        spinlock_t              flc_lock;
+        struct list_head        flc_flock;
+        struct list_head        flc_posix;
+        struct list_head        flc_lease;
+        int                     flc_flock_cnt;
+        int                     flc_posix_cnt;
+        int                     flc_lease_cnt;
+};
+
 /* The following constant reflects the upper bound of the file/locking space */
 #ifndef OFFSET_MAX
 #define INT_LIMIT(x)    (~((x)1 << (sizeof(x)*8 - 1)))
@@ -990,6 +1002,7 @@ extern int fcntl_setlease(unsigned int fd, struct file *filp, long arg);
 extern int fcntl_getlease(struct file *filp);
 
 /* fs/locks.c */
+void locks_free_lock_context(struct file_lock_context *ctx);
 void locks_free_lock(struct file_lock *fl);
 extern void locks_init_lock(struct file_lock *);
 extern struct file_lock * locks_alloc_lock(void);
@@ -1010,7 +1023,7 @@ extern int __break_lease(struct inode *inode, unsigned int flags, unsigned int t
 extern void lease_get_mtime(struct inode *, struct timespec *time);
 extern int generic_setlease(struct file *, long, struct file_lock **, void **priv);
 extern int vfs_setlease(struct file *, long, struct file_lock **, void **);
-extern int lease_modify(struct file_lock **, int, struct list_head *);
+extern int lease_modify(struct file_lock *, int, struct list_head *);
 #else /* !CONFIG_FILE_LOCKING */
 static inline int fcntl_getlk(struct file *file, unsigned int cmd,
                               struct flock __user *user)
@@ -1047,6 +1060,11 @@ static inline int fcntl_getlease(struct file *filp)
         return F_UNLCK;
 }
 
+static inline void
+locks_free_lock_context(struct file_lock_context *ctx)
+{
+}
+
 static inline void locks_init_lock(struct file_lock *fl)
 {
         return;
@@ -1137,7 +1155,7 @@ static inline int vfs_setlease(struct file *filp, long arg,
         return -EINVAL;
 }
 
-static inline int lease_modify(struct file_lock **before, int arg,
+static inline int lease_modify(struct file_lock *fl, int arg,
                                struct list_head *dispose)
 {
         return -EINVAL;
@@ -1959,7 +1977,7 @@ static inline int locks_verify_truncate(struct inode *inode,
                                     struct file *filp,
                                     loff_t size)
 {
-        if (inode->i_flock && mandatory_lock(inode))
+        if (inode->i_flctx && mandatory_lock(inode))
                 return locks_mandatory_area(
                         FLOCK_VERIFY_WRITE, inode, filp,
                         size < inode->i_size ? size : inode->i_size,
@@ -1973,11 +1991,12 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
 {
         /*
          * Since this check is lockless, we must ensure that any refcounts
-         * taken are done before checking inode->i_flock. Otherwise, we could
-         * end up racing with tasks trying to set a new lease on this file.
+         * taken are done before checking i_flctx->flc_lease. Otherwise, we
+         * could end up racing with tasks trying to set a new lease on this
+         * file.
          */
         smp_mb();
-        if (inode->i_flock)
+        if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease))
                 return __break_lease(inode, mode, FL_LEASE);
         return 0;
 }
@@ -1986,11 +2005,12 @@ static inline int break_deleg(struct inode *inode, unsigned int mode)
 {
         /*
          * Since this check is lockless, we must ensure that any refcounts
-         * taken are done before checking inode->i_flock. Otherwise, we could
-         * end up racing with tasks trying to set a new lease on this file.
+         * taken are done before checking i_flctx->flc_lease. Otherwise, we
+         * could end up racing with tasks trying to set a new lease on this
+         * file.
          */
         smp_mb();
-        if (inode->i_flock)
+        if (inode->i_flctx && !list_empty_careful(&inode->i_flctx->flc_lease))
                 return __break_lease(inode, mode, FL_DELEG);
         return 0;
 }