From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Nick Piggin <npiggin@kernel.dk>
Subject: linux-next: manual merge of the nilfs2 tree with the tree
Date: Mon, 10 Jan 2011 12:07:46 +1100 [thread overview]
Message-ID: <20110110120746.7cd287b0.sfr@canb.auug.org.au> (raw)
Hi Ryusuke,
Today's linux-next merge of the nilfs2 tree got a conflict in
fs/nilfs2/nilfs.h between commit b74c79e99389cd79b31fcc08f82c24e492e63c7e
("fs: provide rcu-walk aware permission i_ops") from Linus' tree and
commit aa9ded135baf342ec5a299b254f0e0dbd5c3c0f0 ("nilfs2: do not pass sbi
to functions which can get it from inode") from the nilfs2 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/nilfs.h
index 0ca9882,04ba110..0000000
--- a/fs/nilfs2/nilfs.h
+++ b/fs/nilfs2/nilfs.h
@@@ -256,14 -251,14 +251,14 @@@ extern void nilfs_update_inode(struct i
extern void nilfs_truncate(struct inode *);
extern void nilfs_evict_inode(struct inode *);
extern int nilfs_setattr(struct dentry *, struct iattr *);
-int nilfs_permission(struct inode *inode, int mask);
+int nilfs_permission(struct inode *inode, int mask, unsigned int flags);
- extern int nilfs_load_inode_block(struct nilfs_sb_info *, struct inode *,
- struct buffer_head **);
+ int nilfs_load_inode_block(struct inode *inode, struct buffer_head **pbh);
extern int nilfs_inode_dirty(struct inode *);
- extern int nilfs_set_file_dirty(struct nilfs_sb_info *, struct inode *,
- unsigned);
+ int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty);
extern int nilfs_mark_inode_dirty(struct inode *);
extern void nilfs_dirty_inode(struct inode *);
+ int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ __u64 start, __u64 len);
/* super.c */
extern struct inode *nilfs_alloc_inode(struct super_block *);
next reply other threads:[~2011-01-10 1:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-10 1:07 Stephen Rothwell [this message]
2011-01-10 5:58 ` 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=20110110120746.7cd287b0.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=konishi.ryusuke@lab.ntt.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=npiggin@kernel.dk \
/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
all inboxes | Powered by JetHome®