#include "glock.h"
#include "inode.h"
#include "ops_vm.h"
-#include "page.h"
#include "quota.h"
#include "rgrp.h"
#include "trans.h"
unsigned long address, int *type)
{
struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
- struct gfs2_holder i_gh;
struct page *result;
- int error;
-
- error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &i_gh);
- if (error)
- return NULL;
set_bit(GIF_PAGED, &ip->i_flags);
if (result && result != NOPAGE_OOM)
pfault_be_greedy(ip);
- gfs2_glock_dq_uninit(&i_gh);
-
return result;
}
goto out_ipres;
if (gfs2_is_stuffed(ip)) {
- error = gfs2_unstuff_dinode(ip, gfs2_unstuffer_page, NULL);
+ error = gfs2_unstuff_dinode(ip, NULL);
if (error)
goto out_trans;
}
static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
unsigned long address, int *type)
{
- struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
+ struct file *file = area->vm_file;
+ struct gfs2_file *gf = file->private_data;
+ struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
struct gfs2_holder i_gh;
struct page *result = NULL;
unsigned long index = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) +
set_bit(GIF_PAGED, &ip->i_flags);
set_bit(GIF_SW_PAGED, &ip->i_flags);
- error = gfs2_write_alloc_required(ip,
- (uint64_t)index << PAGE_CACHE_SHIFT,
+ error = gfs2_write_alloc_required(ip, (u64)index << PAGE_CACHE_SHIFT,
PAGE_CACHE_SIZE, &alloc_required);
if (error)
goto out;
+ set_bit(GFF_EXLOCK, &gf->f_flags);
result = filemap_nopage(area, address, type);
+ clear_bit(GFF_EXLOCK, &gf->f_flags);
if (!result || result == NOPAGE_OOM)
goto out;
}
pfault_be_greedy(ip);
-
- out:
+out:
gfs2_glock_dq_uninit(&i_gh);
return result;