Attachment 291980 Details for Bug 428751 – A new version of the patch

[patch] A new version of the patch

page_mkwrite.diff (text/plain), 14.33 KB, created by Steve Whitehouse on 2008-01-17 11:32:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-01-17 11:32:03 UTC

Size: 14.33 KB

patch

obsolete

>diff -Nrup linux-rhel-base/fs/gfs2/glops.c linux-2.6.18.noarch/fs/gfs2/glops.c
>--- linux-rhel-base/fs/gfs2/glops.c	2008-01-16 10:50:19.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/glops.c	2008-01-16 17:15:58.000000000 +0000
>@@ -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);
> }
> 
> /**
>@@ -237,10 +232,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 -Nrup linux-rhel-base/fs/gfs2/incore.h linux-2.6.18.noarch/fs/gfs2/incore.h
>--- linux-rhel-base/fs/gfs2/incore.h	2008-01-16 10:50:24.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/incore.h	2008-01-16 16:24:22.000000000 +0000
>@@ -241,7 +241,6 @@ struct gfs2_alloc {
> enum {
> 	GIF_INVALID		= 0,
> 	GIF_QD_LOCKED		= 1,
>-	GIF_PAGED		= 2,
> 	GIF_SW_PAGED		= 3,
> };
> 
>@@ -292,13 +291,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 -Nrup linux-rhel-base/fs/gfs2/Makefile linux-2.6.18.noarch/fs/gfs2/Makefile
>--- linux-rhel-base/fs/gfs2/Makefile	2008-01-16 10:50:13.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/Makefile	2008-01-16 16:22:53.000000000 +0000
>@@ -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 -Nrup linux-rhel-base/fs/gfs2/ops_address.c linux-2.6.18.noarch/fs/gfs2/ops_address.c
>--- linux-rhel-base/fs/gfs2/ops_address.c	2008-01-16 10:50:24.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_address.c	2008-01-16 17:15:58.000000000 +0000
>@@ -496,18 +496,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);
>@@ -515,7 +508,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);
>@@ -526,7 +518,7 @@ skip_lock:
> 		error = -EIO;
> 
> 	if (do_unlock) {
>-		gfs2_glock_dq_m(1, &gh);
>+		gfs2_glock_dq(&gh);
> 		gfs2_holder_uninit(&gh);
> 	}
> out:
>@@ -554,9 +546,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_get_block() 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)
> {
>@@ -568,38 +559,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_get_block);
> 
> 	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 -Nrup linux-rhel-base/fs/gfs2/ops_file.c linux-2.6.18.noarch/fs/gfs2/ops_file.c
>--- linux-rhel-base/fs/gfs2/ops_file.c	2008-01-16 10:50:22.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_file.c	2008-01-17 11:24:03.000000000 +0000
>@@ -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, 1, &bh);
>+		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 -Nrup linux-rhel-base/fs/gfs2/ops_vm.c linux-2.6.18.noarch/fs/gfs2/ops_vm.c
>--- linux-rhel-base/fs/gfs2/ops_vm.c	2008-01-16 10:50:13.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_vm.c	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -Nrup linux-rhel-base/fs/gfs2/ops_vm.h linux-2.6.18.noarch/fs/gfs2/ops_vm.h
>--- linux-rhel-base/fs/gfs2/ops_vm.h	2008-01-16 10:50:03.000000000 +0000
>+++ linux-2.6.18.noarch/fs/gfs2/ops_vm.h	1970-01-01 01:00:00.000000000 +0100
>@@ -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