* linux-next: manual merge of the vfs tree with the nilfs tree
@ 2009-06-09 1:11 Stephen Rothwell
2009-06-09 5:41 ` Ryusuke Konishi
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-06-09 1:11 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Ryusuke Konishi
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflicts in
fs/nilfs2/super.c between commits from the nilfs tree and similar commits
from the vfs tree.
The vfs and nilfs trees have different versions of the following patches:
nilfs2: get rid of sget use for checking if current mount is present
nilfs2: simplify remaining sget() use
nilfs2: correct exclusion control in nilfs_remount function
And the vfs tree has further commits that affect this files as well.
For now, I have used the vfs tree version. Please sort this out.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the vfs tree with the nilfs tree
2009-06-09 1:11 Stephen Rothwell
@ 2009-06-09 5:41 ` Ryusuke Konishi
0 siblings, 0 replies; 3+ messages in thread
From: Ryusuke Konishi @ 2009-06-09 5:41 UTC (permalink / raw)
To: sfr, viro; +Cc: linux-next, linux-kernel, konishi.ryusuke
Hi,
On Tue, 9 Jun 2009 11:11:14 +1000, Stephen Rothwell wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflicts in
> fs/nilfs2/super.c between commits from the nilfs tree and similar commits
> from the vfs tree.
>
> The vfs and nilfs trees have different versions of the following patches:
>
> nilfs2: get rid of sget use for checking if current mount is present
> nilfs2: simplify remaining sget() use
> nilfs2: correct exclusion control in nilfs_remount function
>
> And the vfs tree has further commits that affect this files as well.
>
> For now, I have used the vfs tree version. Please sort this out.
I've confirmed that the patch series is applied to the vfs tree.
To avoid the conflict, I will remove them from my nilfs2 tree.
Thanks,
Ryusuke Konishi
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the vfs tree with the nilfs tree
@ 2010-07-05 0:02 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2010-07-05 0:02 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Jiro SEKIBA, Ryusuke Konishi
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;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-05 0:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-05 0:02 linux-next: manual merge of the vfs tree with the nilfs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 1:11 Stephen Rothwell
2009-06-09 5:41 ` Ryusuke Konishi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox