From 30d23ba3c52ba6deac912629014701a79c4965f2 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Thu, 3 Dec 2009 18:51:37 -0500 Subject: [PATCH] Unionfs: make our lower_vm_ops pointer a const, to match VFS Signed-off-by: Erez Zadok --- fs/unionfs/file.c | 2 +- fs/unionfs/mmap.c | 2 +- fs/unionfs/union.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c index 281169ee28a..d68b0d59c5f 100644 --- a/fs/unionfs/file.c +++ b/fs/unionfs/file.c @@ -98,7 +98,7 @@ static int unionfs_mmap(struct file *file, struct vm_area_struct *vma) struct file *lower_file; struct dentry *dentry = file->f_path.dentry; struct dentry *parent; - struct vm_operations_struct *saved_vm_ops = NULL; + const struct vm_operations_struct *saved_vm_ops = NULL; /* * Since mm/memory.c:might_fault() (under PROVE_LOCKING) was diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c index 18b05d59449..add4b72b02b 100644 --- a/fs/unionfs/mmap.c +++ b/fs/unionfs/mmap.c @@ -39,7 +39,7 @@ static int unionfs_fault(struct vm_area_struct *vma, struct vm_fault *vmf) { int err; struct file *file, *lower_file; - struct vm_operations_struct *lower_vm_ops; + const struct vm_operations_struct *lower_vm_ops; struct vm_area_struct lower_vma; BUG_ON(!vma); diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h index 17a00567dab..51b5a1f3f7a 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -97,7 +97,7 @@ struct unionfs_file_info { struct unionfs_dir_state *rdstate; struct file **lower_files; int *saved_branch_ids; /* IDs of branches when file was opened */ - struct vm_operations_struct *lower_vm_ops; + const struct vm_operations_struct *lower_vm_ops; bool wrote_to_file; /* for delayed copyup */ }; -- 2.34.1