Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / fs / 9p / vfs_file.c

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 3de3b4a89d89a16a2f23b63a990f8959568583df..03c9e325bfbc1f41e785d45aed5d563b778f959f 100644 (file)
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -288,7 +288,7 @@ static int v9fs_file_getlock(struct file *filp, struct file_lock *fl)
                        fl->fl_end = OFFSET_MAX;
                else
                        fl->fl_end = glock.start + glock.length - 1;
-               fl->fl_pid = glock.proc_id;
+               fl->fl_pid = -glock.proc_id;
        }
        kfree(glock.client_id);
        return res;
@@ -445,7 +445,7 @@ static int v9fs_file_fsync(struct file *filp, loff_t start, loff_t end,
        struct p9_wstat wstat;
        int retval;
 
-       retval = filemap_write_and_wait_range(inode->i_mapping, start, end);
+       retval = file_write_and_wait_range(filp, start, end);
        if (retval)
                return retval;
 
@@ -468,7 +468,7 @@ int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end,
        struct inode *inode = filp->f_mapping->host;
        int retval;
 
-       retval = filemap_write_and_wait_range(inode->i_mapping, start, end);
+       retval = file_write_and_wait_range(filp, start, end);
        if (retval)
                return retval;