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,
Jiro SEKIBA <jir@unicus•jp>,
Ryusuke Konishi <konishi.ryusuke@lab•ntt.co.jp>
Subject: linux-next: manual merge of the vfs tree with the nilfs tree
Date: Mon, 5 Jul 2010 10:02:39 +1000 [thread overview]
Message-ID: <20100705100239.9f92d5e4.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/nilfs2/super.c between commit 9fafbf39607e8002f90ca24b74ccd5be5087e50f
("nilfs2: sync super blocks in turns") from the nilfs tree and commit
030c97b8a358cc3d6322b64ecb67adb849e27cd1 ("convert nilfs2 to
->evict_inode()") from the vfs 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/nilfs2/super.c
index 29be735,7c7572a..0000000
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@@ -168,24 -159,7 +168,7 @@@ void nilfs_destroy_inode(struct inode *
kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
}
- static void nilfs_clear_inode(struct inode *inode)
- {
- struct nilfs_inode_info *ii = NILFS_I(inode);
-
- /*
- * Free resources allocated in nilfs_read_inode(), here.
- */
- BUG_ON(!list_empty(&ii->i_dirty));
- brelse(ii->i_bh);
- ii->i_bh = NULL;
-
- if (test_bit(NILFS_I_BMAP, &ii->i_state))
- nilfs_bmap_clear(ii->i_bmap);
-
- nilfs_btnode_cache_clear(&ii->i_btnode_cache);
- }
-
-static int nilfs_sync_super(struct nilfs_sb_info *sbi, int dupsb)
+static int nilfs_sync_super(struct nilfs_sb_info *sbi, int flag)
{
struct the_nilfs *nilfs = sbi->s_nilfs;
int err;
next reply other threads:[~2010-07-05 0:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-05 0:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 1:11 linux-next: manual merge of the vfs tree with the nilfs tree Stephen Rothwell
2009-06-09 5:41 ` Ryusuke Konishi
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=20100705100239.9f92d5e4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jir@unicus$(echo .)jp \
--cc=konishi.ryusuke@lab$(echo .)ntt.co.jp \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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