From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joel Becker <Joel.Becker@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>, Tao Ma <boyu.mt@taobao.com>
Subject: linux-next: manual merge of the ocfs2 tree with Linus' tree
Date: Mon, 28 Mar 2011 12:00:15 +1100 [thread overview]
Message-ID: <20110328120015.4e913a4b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Hi Joel,
Today's linux-next merge of the ocfs2 tree got a conflict in
fs/ocfs2/super.c between commit 316873c958ee ("ocfs2: use system_wq
instead of ocfs2_quota_wq") from Linus' tree and commit ef6b689b63b9
("ocfs2: Remove ENTRY from masklog") from the ocfs2 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ocfs2/super.c
index 236ed1b,0e40839..0000000
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@@ -1662,12 -1654,12 +1650,11 @@@ static int __init ocfs2_init(void
status = register_quota_format(&ocfs2_quota_format);
leave:
if (status < 0) {
- ocfs2_quota_shutdown();
ocfs2_free_mem_caches();
exit_ocfs2_uptodate_cache();
+ mlog_errno(status);
}
- mlog_exit(status);
-
if (status >= 0) {
return register_filesystem(&ocfs2_fs_type);
} else
@@@ -1676,8 -1668,8 +1663,6 @@@
static void __exit ocfs2_exit(void)
{
- mlog_entry_void();
-
- ocfs2_quota_shutdown();
-
if (ocfs2_wq) {
flush_workqueue(ocfs2_wq);
destroy_workqueue(ocfs2_wq);
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-03-28 1:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 1:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-08-13 0:33 linux-next: manual merge of the ocfs2 tree with Linus' tree Stephen Rothwell
2009-12-17 23:51 Stephen Rothwell
2009-09-23 0:45 Stephen Rothwell
2009-09-23 3:14 ` Joel Becker
2009-09-23 5:25 ` Stephen Rothwell
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=20110328120015.4e913a4b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Joel.Becker@oracle.com \
--cc=boyu.mt@taobao.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tj@kernel.org \
/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).