From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boaz Harrosh <bharrosh@panasas.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: manual merge of the cleancache tree with Linus' tree
Date: Mon, 14 Feb 2011 17:17:15 +1100 [thread overview]
Message-ID: <20110214171715.5f3c6cb4.sfr@canb.auug.org.au> (raw)
Hi Dan,
Today's linux-next merge of the cleancache tree got a conflict in
fs/super.c between commit d863b50ab01333659314c2034890cb76d9fdc3c7 ("vfs:
call rcu_barrier after ->kill_sb()") from Linus' tree and commit
03e838947c8abe29a9d7abfaf7fd9125a46b70e9 ("mm/fs: add hooks to support
cleancache") from the cleancache tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/super.c
index 7e9dd4c,30a54e0..0000000
--- a/fs/super.c
+++ b/fs/super.c
@@@ -30,7 -30,7 +30,8 @@@
#include <linux/idr.h>
#include <linux/mutex.h>
#include <linux/backing-dev.h>
+#include <linux/rculist_bl.h>
+ #include <linux/cleancache.h>
#include "internal.h"
@@@ -177,11 -178,7 +179,12 @@@ void deactivate_locked_super(struct sup
struct file_system_type *fs = s->s_type;
if (atomic_dec_and_test(&s->s_active)) {
fs->kill_sb(s);
+ /*
+ * We need to call rcu_barrier so all the delayed rcu free
+ * inodes are flushed before we release the fs module.
+ */
+ rcu_barrier();
+ cleancache_flush_fs(s);
put_filesystem(fs);
put_super(s);
} else {
next reply other threads:[~2011-02-14 6:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 6:17 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-24 2:55 linux-next: manual merge of the cleancache tree with Linus' tree Stephen Rothwell
2011-03-24 3:56 ` Andrew Morton
2011-03-24 5:38 ` Minchan Kim
2011-03-24 5:58 ` Minchan Kim
2011-03-24 6:42 ` Andrew Morton
2011-03-24 15:37 ` Dan Magenheimer
2011-04-14 21:04 ` Dan Magenheimer
2011-01-15 1:44 Stephen Rothwell
2011-01-14 1:12 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=20110214171715.5f3c6cb4.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=bharrosh@panasas.com \
--cc=dan.magenheimer@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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).