From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15145 invoked by alias); 2 Jun 2009 15:45:24 -0000 Received: (qmail 15092 invoked by alias); 2 Jun 2009 15:45:24 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL54 - Revert "gfs-kernel: bz487610 - Change gfs freeze/unfreeze to use new standard" To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL54 X-Git-Reftype: branch X-Git-Oldrev: 0d82bd7f38bd6e898fdfd5f22c8e1a2386300745 X-Git-Newrev: d97ab88191384c94cfa51840f6379fcc6ecaeb89 From: Chris Feist Message-Id: <20090602154452.32977120154@lists.fedorahosted.org> Date: Tue, 02 Jun 2009 15:45: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-q2/txt/msg00460.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d97ab88191384c94cfa51840f6379fcc6ecaeb89 Commit: d97ab88191384c94cfa51840f6379fcc6ecaeb89 Parent: 0d82bd7f38bd6e898fdfd5f22c8e1a2386300745 Author: Chris Feist AuthorDate: Tue Jun 2 10:42:59 2009 -0500 Committer: Chris Feist CommitterDate: Tue Jun 2 10:42:59 2009 -0500 Revert "gfs-kernel: bz487610 - Change gfs freeze/unfreeze to use new standard" Reverting beause this bz is targetted for 5.5. This reverts commit 28daa9be2045dc307701144631d118e46ed685d3. --- gfs-kernel/src/gfs/ops_fstype.c | 2 +- gfs-kernel/src/gfs/ops_super.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/gfs-kernel/src/gfs/ops_fstype.c b/gfs-kernel/src/gfs/ops_fstype.c index a9d7733..4f0b471 100644 --- a/gfs-kernel/src/gfs/ops_fstype.c +++ b/gfs-kernel/src/gfs/ops_fstype.c @@ -819,7 +819,7 @@ gfs_kill_sb(struct super_block *sb) struct file_system_type gfs_fs_type = { .name = "gfs", - .fs_flags = FS_REQUIRES_DEV | FS_HAS_FREEZE, + .fs_flags = FS_REQUIRES_DEV, .get_sb = gfs_get_sb, .kill_sb = gfs_kill_sb, .owner = THIS_MODULE, diff --git a/gfs-kernel/src/gfs/ops_super.c b/gfs-kernel/src/gfs/ops_super.c index fb7ee0e..7f92691 100644 --- a/gfs-kernel/src/gfs/ops_super.c +++ b/gfs-kernel/src/gfs/ops_super.c @@ -195,19 +195,19 @@ gfs_write_super(struct super_block *sb) } /** - * gfs_freeze - prevent further writes to the filesystem + * gfs_write_super_lockfs - prevent further writes to the filesystem * @sb: the VFS structure for the filesystem * */ -static int -gfs_freeze(struct super_block *sb) +static void +gfs_write_super_lockfs(struct super_block *sb) { struct gfs_sbd *sdp = get_v2sdp(sb); int error; if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) - return -EINVAL; + return; atomic_inc(&sdp->sd_ops_super); @@ -233,24 +233,22 @@ gfs_freeze(struct super_block *sb) set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ); } - return 0; } /** - * gfs_unfreeze - reallow writes to the filesystem + * gfs_unlockfs - reallow writes to the filesystem * @sb: the VFS structure for the filesystem * */ -static int -gfs_unfreeze(struct super_block *sb) +static void +gfs_unlockfs(struct super_block *sb) { struct gfs_sbd *sdp = get_v2sdp(sb); atomic_inc(&sdp->sd_ops_super); gfs_unfreeze_fs(sdp); - return 0; } /** @@ -460,8 +458,8 @@ struct super_operations gfs_super_ops = { .put_inode = gfs_put_inode, .put_super = gfs_put_super, .write_super = gfs_write_super, - .freeze_fs = gfs_freeze, - .unfreeze_fs = gfs_unfreeze, + .write_super_lockfs = gfs_write_super_lockfs, + .unlockfs = gfs_unlockfs, .statfs = gfs_statfs, .remount_fs = gfs_remount_fs, .clear_inode = gfs_clear_inode,