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,
Christoph Hellwig <hch@lst.de>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: linux-next: manual merge of the vfs tree with the tree
Date: Fri, 22 May 2009 11:23:26 +1000 [thread overview]
Message-ID: <20090522112326.9eafa340.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/reiserfs/super.c between commit
d38705358bf6f5ab82348d0c6ee8039cea20ce6b ("reiserfs: kill-the-BKL") from
the reiserfs-bkl tree and commit 8123178eb9ca12cde31a95170746e15a79528a62
("push BKL down into ->put_super") from the vfs tree.
OK, I am not sure what is needed here, so I combined both (see below). I
can carry this fixup as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/reiserfs/super.c
index b301f7d,90dcb7b..0000000
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@@ -468,13 -465,11 +465,18 @@@ static void reiserfs_put_super(struct s
struct reiserfs_transaction_handle th;
th.t_trans_id = 0;
+ lock_kernel();
+
+ /*
+ * We didn't need to explicitly lock here before, because put_super
+ * is called with the bkl held.
+ * Now that we have our own lock, we must explicitly lock.
+ */
+ reiserfs_write_lock(s);
+
+ if (s->s_dirt)
+ reiserfs_write_super(s);
+
/* change file system state to current state if it was mounted with read-write permissions */
if (!(s->s_flags & MS_RDONLY)) {
if (!journal_begin(&th, s, 10)) {
next reply other threads:[~2009-05-22 1:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 1:23 Stephen Rothwell [this message]
2009-05-24 22:03 ` linux-next: manual merge of the vfs tree with the tree Frederic Weisbecker
2009-05-24 22:07 ` Christoph Hellwig
2009-05-25 17:10 ` Frederic Weisbecker
2009-05-25 6:50 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-06-05 5:46 mpe@ellerman.id.au
2014-05-29 3:25 Stephen Rothwell
2012-09-24 1:45 Stephen Rothwell
2009-06-09 1:08 Stephen Rothwell
2009-06-09 6:58 ` Miklos Szeredi
2009-06-09 7:27 ` Stephen Rothwell
2009-05-13 2:20 Stephen Rothwell
2009-05-08 4:44 Stephen Rothwell
2009-05-08 13:40 ` Miklos Szeredi
2009-05-08 17:50 ` Al Viro
2009-05-09 16:58 ` Miklos Szeredi
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=20090522112326.9eafa340.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=fweisbec@gmail.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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: link
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;
as well as URLs for NNTP newsgroup(s).