Merge tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

Pull file locking updates from Jeff Layton:
 "Just a couple of small lease-related patches this cycle.

  One from Ira to add a new tracepoint that fires during lease conflict
  checks, and another patch from Amir to reduce false positives when
  checking for lease conflicts"

* tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: eliminate false positive conflicts for write lease
  locks: Add trace_leases_conflict

diff --combined include/linux/fs.h
index c564cf3,419e327..4fb399b
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -694,7 -694,7 +694,7 @@@ struct inode 
        atomic_t                i_count;
        atomic_t                i_dio_count;
        atomic_t                i_writecount;
- #ifdef CONFIG_IMA
+ #if defined(CONFIG_IMA) || defined(CONFIG_FILE_LOCKING)
        atomic_t                i_readcount; /* struct files open RO */
  #endif
        union {
@@@ -1769,7 -1769,7 +1769,7 @@@ struct block_device_operations
  /*
   * These flags control the behavior of the remap_file_range function pointer.
   * If it is called with len == 0 that means "remap to end of source file".
 - * See Documentation/filesystems/vfs.txt for more details about this call.
 + * See Documentation/filesystems/vfs.rst for more details about this call.
   *
   * REMAP_FILE_DEDUP: only remap if contents identical (i.e. deduplicate)
   * REMAP_FILE_CAN_SHORTEN: caller can handle a shortened request
@@@ -2890,7 -2890,7 +2890,7 @@@ static inline bool inode_is_open_for_wr
        return atomic_read(&inode->i_writecount) > 0;
  }
  
- #ifdef CONFIG_IMA
+ #if defined(CONFIG_IMA) || defined(CONFIG_FILE_LOCKING)
  static inline void i_readcount_dec(struct inode *inode)
  {
        BUG_ON(!atomic_read(&inode->i_readcount));