aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/ops_vm.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/ops_vm.c')
-rw-r--r--fs/gfs2/ops_vm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/gfs2/ops_vm.c b/fs/gfs2/ops_vm.c
index bfeb920dccee..dbc57071e7bb 100644
--- a/fs/gfs2/ops_vm.c
+++ b/fs/gfs2/ops_vm.c
@@ -14,9 +14,12 @@
14#include <linux/buffer_head.h> 14#include <linux/buffer_head.h>
15#include <linux/mm.h> 15#include <linux/mm.h>
16#include <linux/pagemap.h> 16#include <linux/pagemap.h>
17#include <linux/gfs2_ondisk.h>
17#include <asm/semaphore.h> 18#include <asm/semaphore.h>
18 19
19#include "gfs2.h" 20#include "gfs2.h"
21#include "lm_interface.h"
22#include "incore.h"
20#include "bmap.h" 23#include "bmap.h"
21#include "glock.h" 24#include "glock.h"
22#include "inode.h" 25#include "inode.h"
@@ -25,6 +28,7 @@
25#include "quota.h" 28#include "quota.h"
26#include "rgrp.h" 29#include "rgrp.h"
27#include "trans.h" 30#include "trans.h"
31#include "util.h"
28 32
29static void pfault_be_greedy(struct gfs2_inode *ip) 33static void pfault_be_greedy(struct gfs2_inode *ip)
30{ 34{
@@ -43,7 +47,7 @@ static void pfault_be_greedy(struct gfs2_inode *ip)
43static struct page *gfs2_private_nopage(struct vm_area_struct *area, 47static struct page *gfs2_private_nopage(struct vm_area_struct *area,
44 unsigned long address, int *type) 48 unsigned long address, int *type)
45{ 49{
46 struct gfs2_inode *ip = get_v2ip(area->vm_file->f_mapping->host); 50 struct gfs2_inode *ip = area->vm_file->f_mapping->host->u.generic_ip;
47 struct gfs2_holder i_gh; 51 struct gfs2_holder i_gh;
48 struct page *result; 52 struct page *result;
49 int error; 53 int error;
@@ -141,7 +145,7 @@ static int alloc_page_backing(struct gfs2_inode *ip, struct page *page)
141static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area, 145static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
142 unsigned long address, int *type) 146 unsigned long address, int *type)
143{ 147{
144 struct gfs2_inode *ip = get_v2ip(area->vm_file->f_mapping->host); 148 struct gfs2_inode *ip = area->vm_file->f_mapping->host->u.generic_ip;
145 struct gfs2_holder i_gh; 149 struct gfs2_holder i_gh;
146 struct page *result = NULL; 150 struct page *result = NULL;
147 unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) + 151 unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) +