From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1550 invoked by alias); 22 Jan 2009 20:15:20 -0000 Received: (qmail 1544 invoked by alias); 22 Jan 2009 20:15:19 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: gfs1-utils: master - gfs-kernel: Bring gfs1 up to speed with 2.6.29-rc2 To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs1-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4de805c40d59e4555cf1973d2a8ee7e300ec4d76 X-Git-Newrev: e4340554eec18d8c26084f2488dfef28eb67f542 From: Abhijith Das Message-Id: <20090122201458.C3D90C024D@lists.fedorahosted.org> Date: Thu, 22 Jan 2009 20:15:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00193.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=e4340554eec18d8c26084f2488dfef28eb67f542 Commit: e4340554eec18d8c26084f2488dfef28eb67f542 Parent: 4de805c40d59e4555cf1973d2a8ee7e300ec4d76 Author: Abhijith Das AuthorDate: Thu Jan 22 14:12:54 2009 -0600 Committer: Abhijith Das CommitterDate: Thu Jan 22 14:12:54 2009 -0600 gfs-kernel: Bring gfs1 up to speed with 2.6.29-rc2 This patch fixes gfs1 to compile and run with 2.6.29-rc2 Signed-off-by: Abhijith Das --- gfs-kernel/src/gfs/ops_address.c | 2 +- gfs-kernel/src/gfs/ops_super.c | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gfs-kernel/src/gfs/ops_address.c b/gfs-kernel/src/gfs/ops_address.c index 55071a2..5e55477 100644 --- a/gfs-kernel/src/gfs/ops_address.c +++ b/gfs-kernel/src/gfs/ops_address.c @@ -331,7 +331,7 @@ gfs_write_begin(struct file *file, struct address_space *mapping, return -ENOSYS; error = -ENOMEM; - page = __grab_cache_page(mapping, index); + page = grab_cache_page_write_begin(mapping, index, flags); *pagep = page; if (!page) goto out; diff --git a/gfs-kernel/src/gfs/ops_super.c b/gfs-kernel/src/gfs/ops_super.c index afac554..51134d2 100644 --- a/gfs-kernel/src/gfs/ops_super.c +++ b/gfs-kernel/src/gfs/ops_super.c @@ -183,19 +183,19 @@ gfs_write_super(struct super_block *sb) } /** - * gfs_write_super_lockfs - prevent further writes to the filesystem + * gfs_freeze - prevent further writes to the filesystem * @sb: the VFS structure for the filesystem * */ -static void -gfs_write_super_lockfs(struct super_block *sb) +static int +gfs_freeze(struct super_block *sb) { struct gfs_sbd *sdp = get_v2sdp(sb); int error; if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) - return; + return -EINVAL; atomic_inc(&sdp->sd_ops_super); @@ -221,22 +221,24 @@ gfs_write_super_lockfs(struct super_block *sb) set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ); } + return 0; } /** - * gfs_unlockfs - reallow writes to the filesystem + * gfs_unfreeze - reallow writes to the filesystem * @sb: the VFS structure for the filesystem * */ -static void -gfs_unlockfs(struct super_block *sb) +static int +gfs_unfreeze(struct super_block *sb) { struct gfs_sbd *sdp = get_v2sdp(sb); atomic_inc(&sdp->sd_ops_super); gfs_unfreeze_fs(sdp); + return 0; } /** @@ -446,8 +448,8 @@ struct super_operations gfs_super_ops = { .drop_inode = gfs_drop_inode, .put_super = gfs_put_super, .write_super = gfs_write_super, - .write_super_lockfs = gfs_write_super_lockfs, - .unlockfs = gfs_unlockfs, + .freeze_fs = gfs_freeze, + .unfreeze_fs = gfs_unfreeze, .statfs = gfs_statfs, .remount_fs = gfs_remount_fs, .clear_inode = gfs_clear_inode,