Attachment 292006 Details for Bug 428751 – A new version of the patch (RHEL5 over perf. patch)

[patch] A new version of the patch (RHEL5 over perf. patch)

datacorruption3.patch (text/plain), 34.98 KB, created by Robert Peterson on 2008-01-17 15:39:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2008-01-17 15:39:41 UTC

Size: 34.98 KB

patch

obsolete

>diff -purN a/linux-2.6.18.i686/fs/gfs2/glops.c b/linux-2.6.18.i686/fs/gfs2/glops.c
>--- a/linux-2.6.18.i686/fs/gfs2/glops.c	2008-01-16 09:18:08.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/glops.c	2008-01-16 11:51:21.000000000 -0600
>@@ -86,15 +86,10 @@ static void gfs2_pte_inval(struct gfs2_g
> 	if (!ip || !S_ISREG(inode->i_mode))
> 		return;
> 
>-	if (!test_bit(GIF_PAGED, &ip->i_flags))
>-		return;
>-
> 	unmap_shared_mapping_range(inode->i_mapping, 0, 0);
>-
> 	if (test_bit(GIF_SW_PAGED, &ip->i_flags))
> 		set_bit(GLF_DIRTY, &gl->gl_flags);
> 
>-	clear_bit(GIF_SW_PAGED, &ip->i_flags);
> }
> 
> /**
>@@ -258,10 +253,8 @@ static void inode_go_inval(struct gfs2_g
> 			set_bit(GIF_INVALID, &ip->i_flags);
> 	}
> 
>-	if (ip && S_ISREG(ip->i_inode.i_mode)) {
>+	if (ip && S_ISREG(ip->i_inode.i_mode))
> 		truncate_inode_pages(ip->i_inode.i_mapping, 0);
>-		clear_bit(GIF_PAGED, &ip->i_flags);
>-	}
> }
> 
> /**
>diff -purN a/linux-2.6.18.i686/fs/gfs2/incore.h b/linux-2.6.18.i686/fs/gfs2/incore.h
>--- a/linux-2.6.18.i686/fs/gfs2/incore.h	2008-01-16 09:18:08.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/incore.h	2008-01-16 11:51:21.000000000 -0600
>@@ -240,7 +240,6 @@ struct gfs2_alloc {
> enum {
> 	GIF_INVALID		= 0,
> 	GIF_QD_LOCKED		= 1,
>-	GIF_PAGED		= 2,
> 	GIF_SW_PAGED		= 3,
> };
> 
>@@ -290,13 +289,7 @@ static inline struct gfs2_sbd *GFS2_SB(c
> 	return inode->i_sb->s_fs_info;
> }
> 
>-enum {
>-	GFF_DID_DIRECT_ALLOC	= 0,
>-	GFF_EXLOCK = 1,
>-};
>-
> struct gfs2_file {
>-	unsigned long f_flags;		/* GFF_... */
> 	struct mutex f_fl_mutex;
> 	struct gfs2_holder f_fl_gh;
> };
>diff -purN a/linux-2.6.18.i686/fs/gfs2/Makefile b/linux-2.6.18.i686/fs/gfs2/Makefile
>--- a/linux-2.6.18.i686/fs/gfs2/Makefile	2008-01-14 11:51:14.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/Makefile	2008-01-16 11:51:21.000000000 -0600
>@@ -2,7 +2,7 @@ obj-$(CONFIG_GFS2_FS) += gfs2.o
> gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \
> 	glops.o inode.o lm.o log.o lops.o locking.o main.o meta_io.o \
> 	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \
>-	ops_fstype.o ops_inode.o ops_super.o ops_vm.o quota.o \
>+	ops_fstype.o ops_inode.o ops_super.o quota.o \
> 	recovery.o rgrp.o super.o sys.o trans.o util.o
> 
> obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/
>diff -purN a/linux-2.6.18.i686/fs/gfs2/ops_address.c b/linux-2.6.18.i686/fs/gfs2/ops_address.c
>--- a/linux-2.6.18.i686/fs/gfs2/ops_address.c	2008-01-16 09:18:08.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/ops_address.c	2008-01-16 11:57:18.000000000 -0600
>@@ -480,18 +480,11 @@ static int gfs2_readpage(struct file *fi
> {
> 	struct gfs2_inode *ip = GFS2_I(page->mapping->host);
> 	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
>-	struct gfs2_file *gf = NULL;
> 	struct gfs2_holder gh;
> 	int error;
> 	int do_unlock = 0;
> 
> 	if (likely(file != &gfs2_internal_file_sentinel)) {
>-		if (file) {
>-			gf = file->private_data;
>-			if (test_bit(GFF_EXLOCK, &gf->f_flags))
>-				/* gfs2_sharewrite_nopage has grabbed the ip->i_gl already */
>-				goto skip_lock;
>-		}
> 		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|LM_FLAG_TRY_1CB, &gh);
> 		do_unlock = 1;
> 		error = gfs2_glock_nq_atime(&gh);
>@@ -499,7 +492,6 @@ static int gfs2_readpage(struct file *fi
> 			goto out_unlock;
> 	}
> 
>-skip_lock:
> 	if (gfs2_is_stuffed(ip)) {
> 		error = stuffed_readpage(ip, page);
> 		unlock_page(page);
>@@ -510,7 +502,7 @@ skip_lock:
> 		error = -EIO;
> 
> 	if (do_unlock) {
>-		gfs2_glock_dq_m(1, &gh);
>+		gfs2_glock_dq(&gh);
> 		gfs2_holder_uninit(&gh);
> 	}
> out:
>@@ -538,9 +530,8 @@ out_unlock:
>  * 2. We don't handle stuffed files here we let readpage do the honours.
>  * 3. mpage_readpages() does most of the heavy lifting in the common case.
>  * 4. gfs2_block_map() is relied upon to set BH_Boundary in the right places.
>- * 5. We use LM_FLAG_TRY_1CB here, effectively we then have lock-ahead as
>- *    well as read-ahead.
>  */
>+
> static int gfs2_readpages(struct file *file, struct address_space *mapping,
> 			  struct list_head *pages, unsigned nr_pages)
> {
>@@ -552,38 +543,24 @@ static int gfs2_readpages(struct file *f
> 	int do_unlock = 0;
> 
> 	if (likely(file != &gfs2_internal_file_sentinel)) {
>-		if (file) {
>-			struct gfs2_file *gf = file->private_data;
>-			if (test_bit(GFF_EXLOCK, &gf->f_flags))
>-				goto skip_lock;
>-		}
>-		gfs2_holder_init(ip->i_gl, LM_ST_SHARED,
>-				 LM_FLAG_TRY_1CB|GL_ATIME, &gh);
>+		gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
> 		do_unlock = 1;
> 		ret = gfs2_glock_nq_atime(&gh);
>-		if (ret == GLR_TRYFAILED)
>-			goto out_noerror;
> 		if (unlikely(ret))
>-			goto out_unlock;
>+			goto out_uninit;
> 	}
>-skip_lock:
>+
> 	if (!gfs2_is_stuffed(ip))
> 		ret = mpage_readpages(mapping, pages, nr_pages, gfs2_block_map);
> 
> 	if (do_unlock) {
>-		gfs2_glock_dq_m(1, &gh);
>+		gfs2_glock_dq(&gh);
>+out_uninit:
> 		gfs2_holder_uninit(&gh);
> 	}
>-out:
> 	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
> 		ret = -EIO;
> 	return ret;
>-out_noerror:
>-	ret = 0;
>-out_unlock:
>-	if (do_unlock)
>-		gfs2_holder_uninit(&gh);
>-	goto out;
> }
> 
> static int gfs2_write_lock_start(struct gfs2_inode *ip, struct page *page,
>diff -purN a/linux-2.6.18.i686/fs/gfs2/ops_file.c b/linux-2.6.18.i686/fs/gfs2/ops_file.c
>--- a/linux-2.6.18.i686/fs/gfs2/ops_file.c	2008-01-16 09:15:58.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/ops_file.c	2008-01-17 08:35:15.000000000 -0600
>@@ -36,7 +36,6 @@
> #include "log.h"
> #include "meta_io.h"
> #include "ops_file.h"
>-#include "ops_vm.h"
> #include "quota.h"
> #include "rgrp.h"
> #include "trans.h"
>@@ -217,7 +216,7 @@ static int gfs2_get_flags(struct file *f
> 	if (put_user(fsflags, ptr))
> 		error = -EFAULT;
> 
>-	gfs2_glock_dq_m(1, &gh);
>+	gfs2_glock_dq(&gh);
> 	gfs2_holder_uninit(&gh);
> 	return error;
> }
>@@ -351,6 +350,128 @@ static long gfs2_ioctl(struct file *filp
> 	return -ENOTTY;
> }
> 
>+/**
>+ * gfs2_allocate_page_backing - Use bmap to allocate blocks
>+ * @page: The (locked) page to allocate backing for
>+ *
>+ * We try to allocate all the blocks required for the page in
>+ * one go. This might fail for various reasons, so we keep
>+ * trying until all the blocks to back this page are allocated.
>+ * If some of the blocks are already allocated, thats ok too.
>+ */
>+
>+static int gfs2_allocate_page_backing(struct page *page)
>+{
>+	struct inode *inode = page->mapping->host;
>+	struct buffer_head bh;
>+	unsigned long size = PAGE_CACHE_SIZE;
>+	u64 lblock = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
>+
>+	do {
>+		bh.b_state = 0;
>+		bh.b_size = size;
>+		gfs2_block_map(inode, lblock, &bh, 1);
>+		if (!buffer_mapped(&bh))
>+			return -EIO;
>+		size -= bh.b_size;
>+		lblock += (bh.b_size >> inode->i_blkbits);
>+	} while(size > 0);
>+	return 0;
>+}
>+
>+/**
>+ * gfs2_page_mkwrite - Make a shared, mmap()ed, page writable
>+ * @vma: The virtual memory area
>+ * @page: The page which is about to become writable
>+ *
>+ * When the page becomes writable, we need to ensure that we have
>+ * blocks allocated on disk to back that page.
>+ */
>+
>+static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page)
>+{
>+	struct inode *inode = vma->vm_file->f_dentry->d_inode;
>+	struct gfs2_inode *ip = GFS2_I(inode);
>+	struct gfs2_sbd *sdp = GFS2_SB(inode);
>+	unsigned long last_index;
>+	u64 pos = page->index << (PAGE_CACHE_SIZE - inode->i_blkbits);
>+	unsigned int data_blocks, ind_blocks, rblocks;
>+	int alloc_required = 0;
>+	struct gfs2_holder gh;
>+	struct gfs2_alloc *al;
>+	int ret;
>+
>+	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, &gh);
>+	ret = gfs2_glock_nq_atime(&gh);
>+	if (ret)
>+		goto out;
>+
>+	set_bit(GIF_SW_PAGED, &ip->i_flags);
>+	gfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks);
>+	ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required);
>+	if (ret || !alloc_required)
>+		goto out_unlock;
>+	ret = -ENOMEM;
>+	al = gfs2_alloc_get(ip);
>+	if (al == NULL)
>+		goto out_unlock;
>+
>+	ret = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
>+	if (ret)
>+		goto out_alloc_put;
>+	ret = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);
>+	if (ret)
>+		goto out_quota_unlock;
>+	al->al_requested = data_blocks + ind_blocks;
>+	ret = gfs2_inplace_reserve(ip);
>+	if (ret)
>+		goto out_quota_unlock;
>+
>+	rblocks = RES_DINODE + ind_blocks;
>+	if (gfs2_is_jdata(ip))
>+		rblocks += data_blocks ? data_blocks : 1;
>+	if (ind_blocks || data_blocks)
>+		rblocks += RES_STATFS + RES_QUOTA;
>+	ret = gfs2_trans_begin(sdp, rblocks, 0);
>+	if (ret)
>+		goto out_trans_fail;
>+
>+	lock_page(page);
>+	ret = -EINVAL;
>+	last_index = ip->i_inode.i_size >> PAGE_CACHE_SHIFT;
>+	if (page->index > last_index)
>+		goto out_unlock_page;
>+	ret = 0;
>+	if (!PageUptodate(page) || page->mapping != ip->i_inode.i_mapping)
>+		goto out_unlock_page;
>+	if (gfs2_is_stuffed(ip)) {
>+		ret = gfs2_unstuff_dinode(ip, page);
>+		if (ret)
>+			goto out_unlock_page;
>+	}
>+	ret = gfs2_allocate_page_backing(page);
>+
>+out_unlock_page:
>+	unlock_page(page);
>+	gfs2_trans_end(sdp);
>+out_trans_fail:
>+	gfs2_inplace_release(ip);
>+out_quota_unlock:
>+	gfs2_quota_unlock(ip);
>+out_alloc_put:
>+	gfs2_alloc_put(ip);
>+out_unlock:
>+	gfs2_glock_dq(&gh);
>+out:
>+	gfs2_holder_uninit(&gh);
>+	return ret;
>+}
>+
>+static struct vm_operations_struct gfs2_vm_ops = {
>+	.nopage = filemap_nopage,
>+	.page_mkwrite = gfs2_page_mkwrite,
>+};
>+
> 
> /**
>  * gfs2_mmap -
>@@ -373,14 +494,7 @@ static int gfs2_mmap(struct file *file, 
> 		return error;
> 	}
> 
>-	/* This is VM_MAYWRITE instead of VM_WRITE because a call
>-	   to mprotect() can turn on VM_WRITE later. */
>-
>-	if ((vma->vm_flags & (VM_MAYSHARE | VM_MAYWRITE)) ==
>-	    (VM_MAYSHARE | VM_MAYWRITE))
>-		vma->vm_ops = &gfs2_vm_ops_sharewrite;
>-	else
>-		vma->vm_ops = &gfs2_vm_ops_private;
>+	vma->vm_ops = &gfs2_vm_ops;
> 
> 	gfs2_glock_dq_uninit(&i_gh);
> 
>diff -purN a/linux-2.6.18.i686/fs/gfs2/ops_file.c.~1~ b/linux-2.6.18.i686/fs/gfs2/ops_file.c.~1~
>--- a/linux-2.6.18.i686/fs/gfs2/ops_file.c.~1~	1969-12-31 18:00:00.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/ops_file.c.~1~	2008-01-16 12:01:45.000000000 -0600
>@@ -0,0 +1,806 @@
>+/*
>+ * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
>+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
>+ *
>+ * This copyrighted material is made available to anyone wishing to use,
>+ * modify, copy, or redistribute it subject to the terms and conditions
>+ * of the GNU General Public License version 2.
>+ */
>+
>+#include <linux/sched.h>
>+#include <linux/slab.h>
>+#include <linux/spinlock.h>
>+#include <linux/completion.h>
>+#include <linux/buffer_head.h>
>+#include <linux/pagemap.h>
>+#include <linux/uio.h>
>+#include <linux/blkdev.h>
>+#include <linux/mm.h>
>+#include <linux/smp_lock.h>
>+#include <linux/fs.h>
>+#include <linux/gfs2_ondisk.h>
>+#include <linux/ext2_fs.h>
>+#include <linux/crc32.h>
>+#include <linux/lm_interface.h>
>+#include <linux/writeback.h>
>+#include <asm/uaccess.h>
>+
>+#include "gfs2.h"
>+#include "incore.h"
>+#include "bmap.h"
>+#include "dir.h"
>+#include "glock.h"
>+#include "glops.h"
>+#include "inode.h"
>+#include "lm.h"
>+#include "log.h"
>+#include "meta_io.h"
>+#include "ops_file.h"
>+#include "quota.h"
>+#include "rgrp.h"
>+#include "trans.h"
>+#include "util.h"
>+#include "eaops.h"
>+#include "ops_address.h"
>+
>+/*
>+ * Most fields left uninitialised to catch anybody who tries to
>+ * use them. f_flags set to prevent file_accessed() from touching
>+ * any other part of this. Its use is purely as a flag so that we
>+ * know (in readpage()) whether or not do to locking.
>+ */
>+struct file gfs2_internal_file_sentinel = {
>+	.f_flags = O_NOATIME|O_RDONLY,
>+};
>+
>+static int gfs2_read_actor(read_descriptor_t *desc, struct page *page,
>+			   unsigned long offset, unsigned long size)
>+{
>+	char *kaddr;
>+	unsigned long count = desc->count;
>+
>+	if (size > count)
>+		size = count;
>+
>+	kaddr = kmap(page);
>+	memcpy(desc->arg.data, kaddr + offset, size);
>+	kunmap(page);
>+
>+	desc->count = count - size;
>+	desc->written += size;
>+	desc->arg.buf += size;
>+	return size;
>+}
>+
>+int gfs2_internal_read(struct gfs2_inode *ip, struct file_ra_state *ra_state,
>+		       char *buf, loff_t *pos, unsigned size)
>+{
>+	struct inode *inode = &ip->i_inode;
>+	read_descriptor_t desc;
>+	desc.written = 0;
>+	desc.arg.data = buf;
>+	desc.count = size;
>+	desc.error = 0;
>+	do_generic_mapping_read(inode->i_mapping, ra_state,
>+				&gfs2_internal_file_sentinel, pos, &desc,
>+				gfs2_read_actor, 0);
>+	return desc.written ? desc.written : desc.error;
>+}
>+
>+/**
>+ * gfs2_llseek - seek to a location in a file
>+ * @file: the file
>+ * @offset: the offset
>+ * @origin: Where to seek from (SEEK_SET, SEEK_CUR, or SEEK_END)
>+ *
>+ * SEEK_END requires the glock for the file because it references the
>+ * file's size.
>+ *
>+ * Returns: The new offset, or errno
>+ */
>+
>+static loff_t gfs2_llseek(struct file *file, loff_t offset, int origin)
>+{
>+	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
>+	struct gfs2_holder i_gh;
>+	loff_t error;
>+
>+	if (origin == 2) {
>+		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY,
>+					   &i_gh);
>+		if (!error) {
>+			error = remote_llseek(file, offset, origin);
>+			gfs2_glock_dq_uninit(&i_gh);
>+		}
>+	} else
>+		error = remote_llseek(file, offset, origin);
>+
>+	return error;
>+}
>+
>+/**
>+ * gfs2_readdir - Read directory entries from a directory
>+ * @file: The directory to read from
>+ * @dirent: Buffer for dirents
>+ * @filldir: Function used to do the copying
>+ *
>+ * Returns: errno
>+ */
>+
>+static int gfs2_readdir(struct file *file, void *dirent, filldir_t filldir)
>+{
>+	struct inode *dir = file->f_mapping->host;
>+	struct gfs2_inode *dip = GFS2_I(dir);
>+	struct gfs2_holder d_gh;
>+	u64 offset = file->f_pos;
>+	int error;
>+
>+	gfs2_holder_init(dip->i_gl, LM_ST_SHARED, GL_ATIME, &d_gh);
>+	error = gfs2_glock_nq_atime(&d_gh);
>+	if (error) {
>+		gfs2_holder_uninit(&d_gh);
>+		return error;
>+	}
>+
>+	error = gfs2_dir_read(dir, &offset, dirent, filldir);
>+
>+	gfs2_glock_dq_uninit(&d_gh);
>+
>+	file->f_pos = offset;
>+
>+	return error;
>+}
>+
>+/**
>+ * fsflags_cvt
>+ * @table: A table of 32 u32 flags
>+ * @val: a 32 bit value to convert
>+ *
>+ * This function can be used to convert between fsflags values and
>+ * GFS2's own flags values.
>+ *
>+ * Returns: the converted flags
>+ */
>+static u32 fsflags_cvt(const u32 *table, u32 val)
>+{
>+	u32 res = 0;
>+	while(val) {
>+		if (val & 1)
>+			res |= *table;
>+		table++;
>+		val >>= 1;
>+	}
>+	return res;
>+}
>+
>+static const u32 fsflags_to_gfs2[32] = {
>+	[3] = GFS2_DIF_SYNC,
>+	[4] = GFS2_DIF_IMMUTABLE,
>+	[5] = GFS2_DIF_APPENDONLY,
>+	[7] = GFS2_DIF_NOATIME,
>+	[12] = GFS2_DIF_EXHASH,
>+	[14] = GFS2_DIF_INHERIT_JDATA,
>+	[20] = GFS2_DIF_INHERIT_DIRECTIO,
>+};
>+
>+static const u32 gfs2_to_fsflags[32] = {
>+	[gfs2fl_Sync] = FS_SYNC_FL,
>+	[gfs2fl_Immutable] = FS_IMMUTABLE_FL,
>+	[gfs2fl_AppendOnly] = FS_APPEND_FL,
>+	[gfs2fl_NoAtime] = FS_NOATIME_FL,
>+	[gfs2fl_ExHash] = FS_INDEX_FL,
>+	[gfs2fl_InheritDirectio] = FS_DIRECTIO_FL,
>+	[gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL,
>+};
>+
>+static int gfs2_get_flags(struct file *filp, u32 __user *ptr)
>+{
>+	struct inode *inode = filp->f_dentry->d_inode;
>+	struct gfs2_inode *ip = GFS2_I(inode);
>+	struct gfs2_holder gh;
>+	int error;
>+	u32 fsflags;
>+
>+	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh);
>+	error = gfs2_glock_nq_atime(&gh);
>+	if (error)
>+		return error;
>+
>+	fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_di.di_flags);
>+	if (!S_ISDIR(inode->i_mode)) {
>+		if (ip->i_di.di_flags & GFS2_DIF_JDATA)
>+			fsflags |= FS_JOURNAL_DATA_FL;
>+		if (ip->i_di.di_flags & GFS2_DIF_DIRECTIO)
>+			fsflags |= FS_DIRECTIO_FL;
>+	}
>+	if (put_user(fsflags, ptr))
>+		error = -EFAULT;
>+
>+	gfs2_glock_dq(&gh);
>+	gfs2_holder_uninit(&gh);
>+	return error;
>+}
>+
>+void gfs2_set_inode_flags(struct inode *inode)
>+{
>+	struct gfs2_inode *ip = GFS2_I(inode);
>+	struct gfs2_dinode_host *di = &ip->i_di;
>+	unsigned int flags = inode->i_flags;
>+
>+	flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
>+	if (di->di_flags & GFS2_DIF_IMMUTABLE)
>+		flags |= S_IMMUTABLE;
>+	if (di->di_flags & GFS2_DIF_APPENDONLY)
>+		flags |= S_APPEND;
>+	if (di->di_flags & GFS2_DIF_NOATIME)
>+		flags |= S_NOATIME;
>+	if (di->di_flags & GFS2_DIF_SYNC)
>+		flags |= S_SYNC;
>+	inode->i_flags = flags;
>+}
>+
>+/* Flags that can be set by user space */
>+#define GFS2_FLAGS_USER_SET (GFS2_DIF_JDATA|			\
>+			     GFS2_DIF_DIRECTIO|			\
>+			     GFS2_DIF_IMMUTABLE|		\
>+			     GFS2_DIF_APPENDONLY|		\
>+			     GFS2_DIF_NOATIME|			\
>+			     GFS2_DIF_SYNC|			\
>+			     GFS2_DIF_SYSTEM|			\
>+			     GFS2_DIF_INHERIT_DIRECTIO|		\
>+			     GFS2_DIF_INHERIT_JDATA)
>+
>+/**
>+ * gfs2_set_flags - set flags on an inode
>+ * @inode: The inode
>+ * @flags: The flags to set
>+ * @mask: Indicates which flags are valid
>+ *
>+ */
>+static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask)
>+{
>+	struct inode *inode = filp->f_dentry->d_inode;
>+	struct gfs2_inode *ip = GFS2_I(inode);
>+	struct gfs2_sbd *sdp = GFS2_SB(inode);
>+	struct buffer_head *bh;
>+	struct gfs2_holder gh;
>+	int error;
>+	u32 new_flags, flags;
>+
>+	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
>+	if (error)
>+		return error;
>+
>+	flags = ip->i_di.di_flags;
>+	new_flags = (flags & ~mask) | (reqflags & mask);
>+	if ((new_flags ^ flags) == 0)
>+		goto out;
>+
>+	error = -EINVAL;
>+	if ((new_flags ^ flags) & ~GFS2_FLAGS_USER_SET)
>+		goto out;
>+
>+	error = -EPERM;
>+	if (IS_IMMUTABLE(inode) && (new_flags & GFS2_DIF_IMMUTABLE))
>+		goto out;
>+	if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY))
>+		goto out;
>+	if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) &&
>+	    !capable(CAP_LINUX_IMMUTABLE))
>+		goto out;
>+	if (!IS_IMMUTABLE(inode)) {
>+		error = permission(inode, MAY_WRITE, NULL);
>+		if (error)
>+			goto out;
>+	}
>+	if ((flags ^ new_flags) & GFS2_DIF_JDATA) {
>+		if (flags & GFS2_DIF_JDATA)
>+			gfs2_log_flush(sdp, ip->i_gl);
>+		error = filemap_fdatawrite(inode->i_mapping);
>+		if (error)
>+			goto out;
>+		error = filemap_fdatawait(inode->i_mapping);
>+		if (error)
>+			goto out;
>+	}
>+	error = gfs2_trans_begin(sdp, RES_DINODE, 0);
>+	if (error)
>+		goto out;
>+	error = gfs2_meta_inode_buffer(ip, &bh);
>+	if (error)
>+		goto out_trans_end;
>+	gfs2_trans_add_bh(ip->i_gl, bh, 1);
>+	ip->i_di.di_flags = new_flags;
>+	gfs2_dinode_out(ip, bh->b_data);
>+	brelse(bh);
>+	gfs2_set_inode_flags(inode);
>+	gfs2_set_aops(inode);
>+out_trans_end:
>+	gfs2_trans_end(sdp);
>+out:
>+	gfs2_glock_dq_uninit(&gh);
>+	return error;
>+}
>+
>+static int gfs2_set_flags(struct file *filp, u32 __user *ptr)
>+{
>+	struct inode *inode = filp->f_dentry->d_inode;
>+	u32 fsflags, gfsflags;
>+	if (get_user(fsflags, ptr))
>+		return -EFAULT;
>+	gfsflags = fsflags_cvt(fsflags_to_gfs2, fsflags);
>+	if (!S_ISDIR(inode->i_mode)) {
>+		if (gfsflags & GFS2_DIF_INHERIT_JDATA)
>+			gfsflags ^= (GFS2_DIF_JDATA | GFS2_DIF_INHERIT_JDATA);
>+		if (gfsflags & GFS2_DIF_INHERIT_DIRECTIO)
>+			gfsflags ^= (GFS2_DIF_DIRECTIO | GFS2_DIF_INHERIT_DIRECTIO);
>+		return do_gfs2_set_flags(filp, gfsflags, ~0);
>+	}
>+	return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA);
>+}
>+
>+static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>+{
>+	switch(cmd) {
>+	case FS_IOC_GETFLAGS:
>+		return gfs2_get_flags(filp, (u32 __user *)arg);
>+	case FS_IOC_SETFLAGS:
>+		return gfs2_set_flags(filp, (u32 __user *)arg);
>+	}
>+	return -ENOTTY;
>+}
>+
>+/**
>+ * gfs2_allocate_page_backing - Use bmap to allocate blocks
>+ * @page: The (locked) page to allocate backing for
>+ *
>+ * We try to allocate all the blocks required for the page in
>+ * one go. This might fail for various reasons, so we keep
>+ * trying until all the blocks to back this page are allocated.
>+ * If some of the blocks are already allocated, thats ok too.
>+ */
>+
>+static int gfs2_allocate_page_backing(struct page *page)
>+{
>+	struct inode *inode = page->mapping->host;
>+	struct buffer_head bh;
>+	unsigned long size = PAGE_CACHE_SIZE;
>+	u64 lblock = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
>+
>+	do {
>+		bh.b_state = 0;
>+		bh.b_size = size;
>+		gfs2_block_map(inode, lblock, &bh, 1);
>+		if (!buffer_mapped(&bh))
>+			return -EIO;
>+		size -= bh.b_size;
>+		lblock += (bh.b_size >> inode->i_blkbits);
>+	} while(size > 0);
>+	return 0;
>+}
>+
>+/**
>+ * gfs2_page_mkwrite - Make a shared, mmap()ed, page writable
>+ * @vma: The virtual memory area
>+ * @page: The page which is about to become writable
>+ *
>+ * When the page becomes writable, we need to ensure that we have
>+ * blocks allocated on disk to back that page.
>+ */
>+
>+static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct page *page)
>+{
>+	struct inode *inode = vma->vm_file->f_dentry->d_inode;
>+	struct gfs2_inode *ip = GFS2_I(inode);
>+	struct gfs2_sbd *sdp = GFS2_SB(inode);
>+	unsigned long last_index;
>+	u64 pos = page->index << (PAGE_CACHE_SIZE - inode->i_blkbits);
>+	unsigned int data_blocks, ind_blocks, rblocks;
>+	int alloc_required = 0;
>+	struct gfs2_holder gh;
>+	struct gfs2_alloc *al;
>+	int ret;
>+
>+	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, &gh);
>+	ret = gfs2_glock_nq_atime(&gh);
>+	if (ret)
>+		goto out;
>+
>+	set_bit(GIF_SW_PAGED, &ip->i_flags);
>+	gfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks);
>+	ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required);
>+	if (ret || !alloc_required)
>+		goto out_unlock;
>+	ret = -ENOMEM;
>+	al = gfs2_alloc_get(ip);
>+	if (al == NULL)
>+		goto out_unlock;
>+
>+	ret = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
>+	if (ret)
>+		goto out_alloc_put;
>+	ret = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);
>+	if (ret)
>+		goto out_quota_unlock;
>+	al->al_requested = data_blocks + ind_blocks;
>+	ret = gfs2_inplace_reserve(ip);
>+	if (ret)
>+		goto out_quota_unlock;
>+
>+	rblocks = RES_DINODE + ind_blocks;
>+	if (gfs2_is_jdata(ip))
>+		rblocks += data_blocks ? data_blocks : 1;
>+	if (ind_blocks || data_blocks)
>+		rblocks += RES_STATFS + RES_QUOTA;
>+	ret = gfs2_trans_begin(sdp, rblocks, 0);
>+	if (ret)
>+		goto out_trans_fail;
>+
>+	lock_page(page);
>+	ret = -EINVAL;
>+	last_index = ip->i_inode.i_size >> PAGE_CACHE_SHIFT;
>+	if (page->index > last_index)
>+		goto out_unlock_page;
>+	if (!PageUptodate(page) || page->mapping != ip->i_inode.i_mapping)
>+		goto out_unlock_page;
>+	if (gfs2_is_stuffed(ip)) {
>+		ret = gfs2_unstuff_dinode(ip, page);
>+		if (ret)
>+			goto out_unlock_page;
>+	}
>+	ret = gfs2_allocate_page_backing(page);
>+
>+out_unlock_page:
>+	unlock_page(page);
>+	gfs2_trans_end(sdp);
>+out_trans_fail:
>+	gfs2_inplace_release(ip);
>+out_quota_unlock:
>+	gfs2_quota_unlock(ip);
>+out_alloc_put:
>+	gfs2_alloc_put(ip);
>+out_unlock:
>+	gfs2_glock_dq(&gh);
>+out:
>+	gfs2_holder_uninit(&gh);
>+	return ret;
>+}
>+
>+static struct vm_operations_struct gfs2_vm_ops = {
>+	.nopage = filemap_nopage,
>+	.page_mkwrite = gfs2_page_mkwrite,
>+};
>+
>+
>+/**
>+ * gfs2_mmap -
>+ * @file: The file to map
>+ * @vma: The VMA which described the mapping
>+ *
>+ * Returns: 0 or error code
>+ */
>+
>+static int gfs2_mmap(struct file *file, struct vm_area_struct *vma)
>+{
>+	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
>+	struct gfs2_holder i_gh;
>+	int error;
>+
>+	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &i_gh);
>+	error = gfs2_glock_nq_atime(&i_gh);
>+	if (error) {
>+		gfs2_holder_uninit(&i_gh);
>+		return error;
>+	}
>+
>+	vma->vm_ops = &gfs2_vm_ops;
>+
>+	gfs2_glock_dq_uninit(&i_gh);
>+
>+	return error;
>+}
>+
>+/**
>+ * gfs2_open - open a file
>+ * @inode: the inode to open
>+ * @file: the struct file for this opening
>+ *
>+ * Returns: errno
>+ */
>+
>+static int gfs2_open(struct inode *inode, struct file *file)
>+{
>+	struct gfs2_inode *ip = GFS2_I(inode);
>+	struct gfs2_holder i_gh;
>+	struct gfs2_file *fp;
>+	int error;
>+
>+	fp = kzalloc(sizeof(struct gfs2_file), GFP_KERNEL);
>+	if (!fp)
>+		return -ENOMEM;
>+
>+	mutex_init(&fp->f_fl_mutex);
>+
>+	gfs2_assert_warn(GFS2_SB(inode), !file->private_data);
>+	file->private_data = fp;
>+
>+	if (S_ISREG(ip->i_inode.i_mode)) {
>+		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY,
>+					   &i_gh);
>+		if (error)
>+			goto fail;
>+
>+		if (!(file->f_flags & O_LARGEFILE) &&
>+		    ip->i_di.di_size > MAX_NON_LFS) {
>+			error = -EFBIG;
>+			goto fail_gunlock;
>+		}
>+
>+		/* Listen to the Direct I/O flag */
>+
>+		if (ip->i_di.di_flags & GFS2_DIF_DIRECTIO)
>+			file->f_flags |= O_DIRECT;
>+
>+		gfs2_glock_dq_uninit(&i_gh);
>+	}
>+
>+	return 0;
>+
>+fail_gunlock:
>+	gfs2_glock_dq_uninit(&i_gh);
>+fail:
>+	file->private_data = NULL;
>+	kfree(fp);
>+	return error;
>+}
>+
>+/**
>+ * gfs2_close - called to close a struct file
>+ * @inode: the inode the struct file belongs to
>+ * @file: the struct file being closed
>+ *
>+ * Returns: errno
>+ */
>+
>+static int gfs2_close(struct inode *inode, struct file *file)
>+{
>+	struct gfs2_sbd *sdp = inode->i_sb->s_fs_info;
>+	struct gfs2_file *fp;
>+
>+	fp = file->private_data;
>+	file->private_data = NULL;
>+
>+	if (gfs2_assert_warn(sdp, fp))
>+		return -EIO;
>+
>+	kfree(fp);
>+
>+	return 0;
>+}
>+
>+/**
>+ * gfs2_fsync - sync the dirty data for a file (across the cluster)
>+ * @file: the file that points to the dentry (we ignore this)
>+ * @dentry: the dentry that points to the inode to sync
>+ *
>+ * The VFS will flush "normal" data for us. We only need to worry
>+ * about metadata here. For journaled data, we just do a log flush
>+ * as we can't avoid it. Otherwise we can just bale out if datasync
>+ * is set. For stuffed inodes we must flush the log in order to
>+ * ensure that all data is on disk.
>+ *
>+ * The call to write_inode_now() is there to write back metadata and
>+ * the inode itself. It does also try and write the data, but thats
>+ * (hopefully) a no-op due to the VFS having already called filemap_fdatawrite()
>+ * for us.
>+ *
>+ * Returns: errno
>+ */
>+
>+static int gfs2_fsync(struct file *file, struct dentry *dentry, int datasync)
>+{
>+	struct inode *inode = dentry->d_inode;
>+	int sync_state = inode->i_state & (I_DIRTY_SYNC|I_DIRTY_DATASYNC);
>+	int ret = 0;
>+
>+	if (gfs2_is_jdata(GFS2_I(inode))) {
>+		gfs2_log_flush(GFS2_SB(inode), GFS2_I(inode)->i_gl);
>+		return 0;
>+	}
>+
>+	if (sync_state != 0) {
>+		if (!datasync)
>+			ret = write_inode_now(inode, 0);
>+
>+		if (gfs2_is_stuffed(GFS2_I(inode)))
>+			gfs2_log_flush(GFS2_SB(inode), GFS2_I(inode)->i_gl);
>+	}
>+
>+	return ret;
>+}
>+
>+/**
>+ * gfs2_lock - acquire/release a posix lock on a file
>+ * @file: the file pointer
>+ * @cmd: either modify or retrieve lock state, possibly wait
>+ * @fl: type and range of lock
>+ *
>+ * Returns: errno
>+ */
>+
>+static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)
>+{
>+	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
>+	struct gfs2_sbd *sdp = GFS2_SB(file->f_mapping->host);
>+	struct lm_lockname name =
>+		{ .ln_number = ip->i_no_addr,
>+		  .ln_type = LM_TYPE_PLOCK };
>+
>+	if (!(fl->fl_flags & FL_POSIX))
>+		return -ENOLCK;
>+	if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
>+		return -ENOLCK;
>+
>+	if (sdp->sd_args.ar_localflocks) {
>+		if (IS_GETLK(cmd)) {
>+			posix_test_lock(file, fl, NULL);
>+			return 0;
>+		} else {
>+			return posix_lock_file_wait(file, fl);
>+		}
>+	}
>+
>+	if (cmd == F_CANCELLK) {
>+		/* Hack: */
>+		cmd = F_SETLK;
>+		fl->fl_type = F_UNLCK;
>+	}
>+	if (IS_GETLK(cmd))
>+		return gfs2_lm_plock_get(sdp, &name, file, fl);
>+	else if (fl->fl_type == F_UNLCK)
>+		return gfs2_lm_punlock(sdp, &name, file, fl);
>+	else
>+		return gfs2_lm_plock(sdp, &name, file, cmd, fl);
>+}
>+
>+static int do_flock(struct file *file, int cmd, struct file_lock *fl)
>+{
>+	struct gfs2_file *fp = file->private_data;
>+	struct gfs2_holder *fl_gh = &fp->f_fl_gh;
>+	struct gfs2_inode *ip = GFS2_I(file->f_dentry->d_inode);
>+	struct gfs2_glock *gl;
>+	unsigned int state;
>+	int flags;
>+	int error = 0;
>+
>+	state = (fl->fl_type == F_WRLCK) ? LM_ST_EXCLUSIVE : LM_ST_SHARED;
>+	flags = (IS_SETLKW(cmd) ? 0 : LM_FLAG_TRY) | GL_EXACT | GL_NOCACHE
>+		| GL_FLOCK;
>+
>+	mutex_lock(&fp->f_fl_mutex);
>+
>+	gl = fl_gh->gh_gl;
>+	if (gl) {
>+		if (fl_gh->gh_state == state)
>+			goto out;
>+		flock_lock_file_wait(file,
>+				     &(struct file_lock){.fl_type = F_UNLCK});
>+		gfs2_glock_dq_wait(fl_gh);
>+		gfs2_holder_reinit(state, flags, fl_gh);
>+	} else {
>+		error = gfs2_glock_get(GFS2_SB(&ip->i_inode),
>+				      ip->i_no_addr, &gfs2_flock_glops,
>+				      CREATE, &gl);
>+		if (error)
>+			goto out;
>+		gfs2_holder_init(gl, state, flags, fl_gh);
>+		gfs2_glock_put(gl);
>+	}
>+	error = gfs2_glock_nq(fl_gh);
>+	if (error) {
>+		gfs2_holder_uninit(fl_gh);
>+		if (error == GLR_TRYFAILED)
>+			error = -EAGAIN;
>+	} else {
>+		error = flock_lock_file_wait(file, fl);
>+		gfs2_assert_warn(GFS2_SB(&ip->i_inode), !error);
>+	}
>+
>+out:
>+	mutex_unlock(&fp->f_fl_mutex);
>+	return error;
>+}
>+
>+static void do_unflock(struct file *file, struct file_lock *fl)
>+{
>+	struct gfs2_file *fp = file->private_data;
>+	struct gfs2_holder *fl_gh = &fp->f_fl_gh;
>+
>+	mutex_lock(&fp->f_fl_mutex);
>+	flock_lock_file_wait(file, fl);
>+	if (fl_gh->gh_gl)
>+		gfs2_glock_dq_uninit(fl_gh);
>+	mutex_unlock(&fp->f_fl_mutex);
>+}
>+
>+/**
>+ * gfs2_flock - acquire/release a flock lock on a file
>+ * @file: the file pointer
>+ * @cmd: either modify or retrieve lock state, possibly wait
>+ * @fl: type and range of lock
>+ *
>+ * Returns: errno
>+ */
>+
>+static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
>+{
>+	struct gfs2_inode *ip = GFS2_I(file->f_mapping->host);
>+
>+	if (!(fl->fl_flags & FL_FLOCK))
>+		return -ENOLCK;
>+	if ((ip->i_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID)
>+		return -ENOLCK;
>+
>+	if (fl->fl_type == F_UNLCK) {
>+		do_unflock(file, fl);
>+		return 0;
>+	} else
>+		return do_flock(file, cmd, fl);
>+}
>+
>+const struct file_operations gfs2_file_fops = {
>+	.llseek		= gfs2_llseek,
>+	.read		= generic_file_read,
>+	.readv		= generic_file_readv,
>+	.aio_read	= generic_file_aio_read,
>+	.write		= generic_file_write,
>+	.writev		= generic_file_writev,
>+	.aio_write	= generic_file_aio_write,
>+	.unlocked_ioctl	= gfs2_ioctl,
>+	.mmap		= gfs2_mmap,
>+	.open		= gfs2_open,
>+	.release	= gfs2_close,
>+	.fsync		= gfs2_fsync,
>+	.lock		= gfs2_lock,
>+	.sendfile	= generic_file_sendfile,
>+	.flock		= gfs2_flock,
>+	.splice_read	= generic_file_splice_read,
>+	.splice_write	= generic_file_splice_write,
>+};
>+
>+const struct file_operations gfs2_dir_fops = {
>+	.readdir	= gfs2_readdir,
>+	.unlocked_ioctl	= gfs2_ioctl,
>+	.open		= gfs2_open,
>+	.release	= gfs2_close,
>+	.fsync		= gfs2_fsync,
>+	.lock		= gfs2_lock,
>+	.flock		= gfs2_flock,
>+};
>+
>+const struct file_operations gfs2_file_fops_nolock = {
>+	.llseek		= gfs2_llseek,
>+	.read		= generic_file_read,
>+	.readv		= generic_file_readv,
>+	.aio_read	= generic_file_aio_read,
>+	.write		= generic_file_write,
>+	.writev		= generic_file_writev,
>+	.aio_write	= generic_file_aio_write,
>+	.unlocked_ioctl	= gfs2_ioctl,
>+	.mmap		= gfs2_mmap,
>+	.open		= gfs2_open,
>+	.release	= gfs2_close,
>+	.fsync		= gfs2_fsync,
>+	.sendfile	= generic_file_sendfile,
>+	.splice_read	= generic_file_splice_read,
>+	.splice_write	= generic_file_splice_write,
>+};
>+
>+const struct file_operations gfs2_dir_fops_nolock = {
>+	.readdir	= gfs2_readdir,
>+	.unlocked_ioctl	= gfs2_ioctl,
>+	.open		= gfs2_open,
>+	.release	= gfs2_close,
>+	.fsync		= gfs2_fsync,
>+};
>+
>diff -purN a/linux-2.6.18.i686/fs/gfs2/ops_vm.c b/linux-2.6.18.i686/fs/gfs2/ops_vm.c
>--- a/linux-2.6.18.i686/fs/gfs2/ops_vm.c	2008-01-16 09:15:58.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/ops_vm.c	1969-12-31 18:00:00.000000000 -0600
>@@ -1,161 +0,0 @@
>-/*
>- * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
>- * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
>- *
>- * This copyrighted material is made available to anyone wishing to use,
>- * modify, copy, or redistribute it subject to the terms and conditions
>- * of the GNU General Public License version 2.
>- */
>-
>-#include <linux/slab.h>
>-#include <linux/spinlock.h>
>-#include <linux/completion.h>
>-#include <linux/buffer_head.h>
>-#include <linux/mm.h>
>-#include <linux/pagemap.h>
>-#include <linux/gfs2_ondisk.h>
>-#include <linux/lm_interface.h>
>-
>-#include "gfs2.h"
>-#include "incore.h"
>-#include "bmap.h"
>-#include "glock.h"
>-#include "inode.h"
>-#include "ops_vm.h"
>-#include "quota.h"
>-#include "rgrp.h"
>-#include "trans.h"
>-#include "util.h"
>-
>-static struct page *gfs2_private_nopage(struct vm_area_struct *area,
>-					unsigned long address, int *type)
>-{
>-	struct gfs2_inode *ip = GFS2_I(area->vm_file->f_mapping->host);
>-
>-	set_bit(GIF_PAGED, &ip->i_flags);
>-	return filemap_nopage(area, address, type);
>-}
>-
>-static int alloc_page_backing(struct gfs2_inode *ip, struct page *page)
>-{
>-	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
>-	unsigned long index = page->index;
>-	u64 lblock = index << (PAGE_CACHE_SHIFT -
>-				    sdp->sd_sb.sb_bsize_shift);
>-	unsigned int blocks = PAGE_CACHE_SIZE >> sdp->sd_sb.sb_bsize_shift;
>-	struct gfs2_alloc *al;
>-	unsigned int data_blocks, ind_blocks;
>-	unsigned int x;
>-	int error;
>-
>-	al = gfs2_alloc_get(ip);
>-
>-	error = gfs2_quota_lock(ip, NO_QUOTA_CHANGE, NO_QUOTA_CHANGE);
>-	if (error)
>-		goto out;
>-
>-	error = gfs2_quota_check(ip, ip->i_inode.i_uid, ip->i_inode.i_gid);
>-	if (error)
>-		goto out_gunlock_q;
>-
>-	gfs2_write_calc_reserv(ip, PAGE_CACHE_SIZE, &data_blocks, &ind_blocks);
>-
>-	al->al_requested = data_blocks + ind_blocks;
>-
>-	error = gfs2_inplace_reserve(ip);
>-	if (error)
>-		goto out_gunlock_q;
>-
>-	error = gfs2_trans_begin(sdp, al->al_rgd->rd_length +
>-				 ind_blocks + RES_DINODE +
>-				 RES_STATFS + RES_QUOTA, 0);
>-	if (error)
>-		goto out_ipres;
>-
>-	if (gfs2_is_stuffed(ip)) {
>-		error = gfs2_unstuff_dinode(ip, NULL);
>-		if (error)
>-			goto out_trans;
>-	}
>-
>-	for (x = 0; x < blocks; ) {
>-		u64 dblock;
>-		unsigned int extlen;
>-		int new = 1;
>-
>-		error = gfs2_extent_map(&ip->i_inode, lblock, &new, &dblock, &extlen);
>-		if (error)
>-			goto out_trans;
>-
>-		lblock += extlen;
>-		x += extlen;
>-	}
>-
>-	gfs2_assert_warn(sdp, al->al_alloced);
>-
>-out_trans:
>-	gfs2_trans_end(sdp);
>-out_ipres:
>-	gfs2_inplace_release(ip);
>-out_gunlock_q:
>-	gfs2_quota_unlock(ip);
>-out:
>-	gfs2_alloc_put(ip);
>-	return error;
>-}
>-
>-static struct page *gfs2_sharewrite_nopage(struct vm_area_struct *area,
>-					   unsigned long address, int *type)
>-{
>-	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) +
>-			      area->vm_pgoff;
>-	int alloc_required;
>-	int error;
>-
>-	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &i_gh);
>-	if (error)
>-		return NULL;
>-
>-	set_bit(GIF_PAGED, &ip->i_flags);
>-	set_bit(GIF_SW_PAGED, &ip->i_flags);
>-
>-	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;
>-
>-	if (alloc_required) {
>-		error = alloc_page_backing(ip, result);
>-		if (error) {
>-			page_cache_release(result);
>-			result = NULL;
>-			goto out;
>-		}
>-		set_page_dirty(result);
>-	}
>-
>-out:
>-	gfs2_glock_dq_uninit(&i_gh);
>-
>-	return result;
>-}
>-
>-struct vm_operations_struct gfs2_vm_ops_private = {
>-	.nopage = gfs2_private_nopage,
>-};
>-
>-struct vm_operations_struct gfs2_vm_ops_sharewrite = {
>-	.nopage = gfs2_sharewrite_nopage,
>-};
>-
>diff -purN a/linux-2.6.18.i686/fs/gfs2/ops_vm.h b/linux-2.6.18.i686/fs/gfs2/ops_vm.h
>--- a/linux-2.6.18.i686/fs/gfs2/ops_vm.h	2008-01-16 09:15:58.000000000 -0600
>+++ b/linux-2.6.18.i686/fs/gfs2/ops_vm.h	1969-12-31 18:00:00.000000000 -0600
>@@ -1,18 +0,0 @@
>-/*
>- * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
>- * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
>- *
>- * This copyrighted material is made available to anyone wishing to use,
>- * modify, copy, or redistribute it subject to the terms and conditions
>- * of the GNU General Public License version 2.
>- */
>-
>-#ifndef __OPS_VM_DOT_H__
>-#define __OPS_VM_DOT_H__
>-
>-#include <linux/mm.h>
>-
>-extern struct vm_operations_struct gfs2_vm_ops_private;
>-extern struct vm_operations_struct gfs2_vm_ops_sharewrite;
>-
>-#endif /* __OPS_VM_DOT_H__ */

Actions: View | Diff

Attachments on bug 428751: 291873 | 291980 | 292006 | 294369 | 295573 | 298089