linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/befs/linuxvfs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit badfbaf2a80c ("befs: replace typedef befs_inode_info by
structure") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/befs/linuxvfs.c
index d3cb8774765f,16e0a48bfccd..000000000000
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@@ -472,7 -471,7 +471,7 @@@ static void 
  befs_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
  	struct super_block *sb = dentry->d_sb;
- 	befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
 -	struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
++	struct befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
  	befs_data_stream *data = &befs_ino->i_data.ds;
  	befs_off_t len = data->size;
  	char *link;
@@@ -502,7 -501,8 +501,8 @@@
  static void *
  befs_fast_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
- 	befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
 -	struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
++	struct befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
+ 
  	nd_set_link(nd, befs_ino->i_data.symlink);
  	return NULL;
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]