locks: plumb a "priv" pointer into the setlease routines

[jlayton/linux.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ac4f260155c875b80d9d6611af1139438e62fc91..85c70d5969ac7f008c105e310f45a291d01d141b 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -800,7 +800,8 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)
        return generic_file_llseek(file, offset, whence);
 }
 
-static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
+static int
+cifs_setlease(struct file *file, long arg, struct file_lock **lease, void **priv)
 {
        /*
         * Note that this is called by vfs setlease with i_lock held to
@@ -815,7 +816,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
        /* check if file is oplocked */
        if (((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) ||
            ((arg == F_WRLCK) && CIFS_CACHE_WRITE(CIFS_I(inode))))
-               return generic_setlease(file, arg, lease);
+               return generic_setlease(file, arg, lease, priv);
        else if (tlink_tcon(cfile->tlink)->local_lease &&
                 !CIFS_CACHE_READ(CIFS_I(inode)))
                /*
@@ -826,7 +827,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
                 * knows that the file won't be changed on the server by anyone
                 * else.
                 */
-               return generic_setlease(file, arg, lease);
+               return generic_setlease(file, arg, lease, priv);
        else
                return -EAGAIN;
 }