public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Abhijith Das <adas@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - gfs-kernel: Bring gfs1 up to speed with 2.6.29-rc2 Date: Thu, 16 Apr 2009 02:59:00 -0000 [thread overview] Message-ID: <20090416025826.542F9120314@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=057f8e766fccf38d66f64f002c7f53d9ec0c4b84 Commit: 057f8e766fccf38d66f64f002c7f53d9ec0c4b84 Parent: d3ea920aa832c3c0d063bb9ac24b08731ee8d8c4 Author: Abhijith Das <adas@redhat.com> AuthorDate: Thu Jan 22 14:12:54 2009 -0600 Committer: Abhijith Das <adas@redhat.com> CommitterDate: Wed Apr 15 21:58:12 2009 -0500 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 <adas@redhat.com> --- 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,
reply other threads:[~2009-04-16 2:59 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090416025826.542F9120314@lists.fedorahosted.org \ --to=adas@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).