locks: new locks_mandatory_area calling convention

Pass a loff_t end for the last byte instead of the 32-bit count
parameter to allow full file clones even on 32-bit architectures.
While we're at it also simplify the read/write selection.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: J. Bruce Fields <bfields@fieldses.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 9 insertions, 13 deletions

diff --git a/fs/locks.c b/fs/locks.c
index 0d2b3267e2a3..c77a299c1e9e 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1227,20 +1227,16 @@ int locks_mandatory_locked(struct file *file)
 
 /**
  * locks_mandatory_area - Check for a conflicting lock
- * @read_write: %FLOCK_VERIFY_WRITE for exclusive access, %FLOCK_VERIFY_READ
- *              for shared
- * @inode:      the file to check
+ * @inode:      the file to check
  * @filp:       how the file was opened (if it was)
- * @offset:     start of area to check
- * @count:      length of area to check
+ * @start:      first byte in the file to check
+ * @end:        lastbyte in the file to check
+ * @type:       %F_WRLCK for a write lock, else %F_RDLCK
  *
  * Searches the inode's list of locks to find any POSIX locks which conflict.
- * This function is called from rw_verify_area() and
- * locks_verify_truncate().
  */
-int locks_mandatory_area(int read_write, struct inode *inode,
-                         struct file *filp, loff_t offset,
-                         size_t count)
+int locks_mandatory_area(struct inode *inode, struct file *filp, loff_t start,
+                         loff_t end, unsigned char type)
 {
         struct file_lock fl;
         int error;
@@ -1252,9 +1248,9 @@ int locks_mandatory_area(int read_write, struct inode *inode,
         fl.fl_flags = FL_POSIX | FL_ACCESS;
         if (filp && !(filp->f_flags & O_NONBLOCK))
                 sleep = true;
-        fl.fl_type = (read_write == FLOCK_VERIFY_WRITE) ? F_WRLCK : F_RDLCK;
-        fl.fl_start = offset;
-        fl.fl_end = offset + count - 1;
+        fl.fl_type = type;
+        fl.fl_start = start;
+        fl.fl_end = end;
 
         for (;;) {
                 if (filp) {