Compilation error fix - Wrafs 4.11

diff --git a/fs/wrapfs/inode.c b/fs/wrapfs/inode.c
index d14a67aa2bb67b42dc0f5f69cf30b579a56bb839..b7ee788a72a119258f4528115bb094f206d55f11 100644 (file)
--- a/fs/wrapfs/inode.c
+++ b/fs/wrapfs/inode.c
@@ -435,15 +435,16 @@ static int wrapfs_setattr(struct dentry *dentry, struct iattr *ia)
        return err;
 }
 
-static int wrapfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
-                         struct kstat *stat)
+static int wrapfs_getattr(const struct path *path, struct kstat *stat, 
+                          u32 request_mask, unsigned int flags)
 {
        int err;
+        struct dentry *dentry = path->dentry;
        struct kstat lower_stat;
        struct path lower_path;
 
        wrapfs_get_lower_path(dentry, &lower_path);
-       err = vfs_getattr(&lower_path, &lower_stat, STATX_TYPE, AT_STATX_SYNC_AS_STAT);
+       err = vfs_getattr(&lower_path, &lower_stat, request_mask, flags);
        if (err)
                goto out;
        fsstack_copy_attr_all(d_inode(dentry),

diff --git a/fs/wrapfs/mmap.c b/fs/wrapfs/mmap.c
index 04b6ae5f1626a4bc06a95705c5fe4dd3c63c1645..419c403e2c69b1ab87426d5ca0d2d67885d53c34 100644 (file)
--- a/fs/wrapfs/mmap.c
+++ b/fs/wrapfs/mmap.c
@@ -11,9 +11,10 @@
 
 #include "wrapfs.h"
 
-static int wrapfs_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int wrapfs_fault(struct vm_fault *vmf)
 {
        int err;
+        struct vm_area_struct *vma = vmf->vma;
        struct file *file, *lower_file;
        const struct vm_operations_struct *lower_vm_ops;
        struct vm_area_struct lower_vma;
@@ -35,14 +36,14 @@ static int wrapfs_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         * take an explicit file pointer.
         */
        lower_vma.vm_file = lower_file;
-       err = lower_vm_ops->fault(/*&lower_vma, */vmf);
+       err = lower_vm_ops->fault(vmf);
        return err;
 }
 
-static int wrapfs_page_mkwrite(struct vm_area_struct *vma,
-                              struct vm_fault *vmf)
+static int wrapfs_page_mkwrite(struct vm_fault *vmf)
 {
        int err = 0;
+        struct vm_area_struct *vma = vmf->vma;
        struct file *file, *lower_file;
        const struct vm_operations_struct *lower_vm_ops;
        struct vm_area_struct lower_vma;
@@ -67,7 +68,7 @@ static int wrapfs_page_mkwrite(struct vm_area_struct *vma,
         * ->page_mkwrite to take an explicit file pointer.
         */
        lower_vma.vm_file = lower_file;
-       err = lower_vm_ops->page_mkwrite(/*&lower_vma, */vmf);
+       err = lower_vm_ops->page_mkwrite(vmf);
 out:
        return err;
 }