Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[mirror_ubuntu-focal-kernel.git] / fs / xfs / linux-2.6 / xfs_file.c

diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
index 0542fd50764945935bd6975bc8094a8df2348601..eff61e2732af27c8aad199ebab5c66d83c5b904f 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
@@ -42,7 +42,7 @@
 
 #include <linux/dcache.h>
 
-static struct vm_operations_struct xfs_file_vm_ops;
+static const struct vm_operations_struct xfs_file_vm_ops;
 
 STATIC ssize_t
 xfs_file_aio_read(
@@ -172,12 +172,14 @@ xfs_file_release(
  */
 STATIC int
 xfs_file_fsync(
-       struct file     *filp,
-       struct dentry   *dentry,
-       int             datasync)
+       struct file             *file,
+       struct dentry           *dentry,
+       int                     datasync)
 {
-       xfs_iflags_clear(XFS_I(dentry->d_inode), XFS_ITRUNCATED);
-       return -xfs_fsync(XFS_I(dentry->d_inode));
+       struct xfs_inode        *ip = XFS_I(dentry->d_inode);
+
+       xfs_iflags_clear(ip, XFS_ITRUNCATED);
+       return -xfs_fsync(ip);
 }
 
 STATIC int
@@ -271,7 +273,7 @@ const struct file_operations xfs_dir_file_operations = {
        .fsync          = xfs_file_fsync,
 };
 
-static struct vm_operations_struct xfs_file_vm_ops = {
+static const struct vm_operations_struct xfs_file_vm_ops = {
        .fault          = filemap_fault,
        .page_mkwrite   = xfs_vm_page_mkwrite,
 };