From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Steven Whitehouse <swhiteho@redhat•com>,
Christoph Hellwig <hch@infradead•org>
Subject: linux-next: manual merge of the vfs tree with the gfs2 tree
Date: Wed, 27 May 2009 11:52:53 +1000 [thread overview]
Message-ID: <20090527115253.37abd576.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/gfs2/ops_super.c between commit
9e6e0a128bca0a151d8d3fbd9459b22fc21cfebb ("GFS2: Merge mount.c and
ops_super.c into super.c") from the gfs2 tree and commits
17af8f24a7750ea3d947904f97eb6dfacf9a88aa ("gfs2: remove ->write_super and
stop maintaining ->s_dirt") and 8123178eb9ca12cde31a95170746e15a79528a62
("push BKL down into ->put_super") from the vfs tree.
The former commit removed the file. I have mechanically applied the
changes in the latter two commits to fs/gfs2/super.c (see below) and can
carry this as a merge fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 40bcc37..c8930b3 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -719,6 +719,8 @@ static void gfs2_put_super(struct super_block *sb)
int error;
struct gfs2_jdesc *jd;
+ lock_kernel();
+
/* Unfreeze the filesystem, if we need to */
mutex_lock(&sdp->sd_freeze_lock);
@@ -785,17 +787,8 @@ restart:
/* At this point, we're through participating in the lockspace */
gfs2_sys_fs_del(sdp);
-}
-
-/**
- * gfs2_write_super
- * @sb: the superblock
- *
- */
-static void gfs2_write_super(struct super_block *sb)
-{
- sb->s_dirt = 0;
+ unlock_kernel();
}
/**
@@ -807,7 +800,6 @@ static void gfs2_write_super(struct super_block *sb)
static int gfs2_sync_fs(struct super_block *sb, int wait)
{
- sb->s_dirt = 0;
if (wait && sb->s_fs_info)
gfs2_log_flush(sb->s_fs_info, NULL);
return 0;
@@ -1324,7 +1316,6 @@ const struct super_operations gfs2_super_ops = {
.write_inode = gfs2_write_inode,
.delete_inode = gfs2_delete_inode,
.put_super = gfs2_put_super,
- .write_super = gfs2_write_super,
.sync_fs = gfs2_sync_fs,
.freeze_fs = gfs2_freeze,
.unfreeze_fs = gfs2_unfreeze,
--
1.6.3.1
next reply other threads:[~2009-05-27 1:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-27 1:52 Stephen Rothwell [this message]
2009-05-27 9:58 ` linux-next: manual merge of the vfs tree with the gfs2 tree Steven Whitehouse
2009-06-12 1:12 ` Stephen Rothwell
2009-06-12 1:19 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2010-01-17 23:55 Stephen Rothwell
2010-01-18 10:56 ` Steven Whitehouse
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=20090527115253.37abd576.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=swhiteho@redhat$(echo .)com \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be 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