linux-next: manual merge of the vfs tree with the logfs tree

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

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/logfs/logfs.h between commit ddbb5dd99c40a695d5d75645b5a18bef394acb16
("logfs: kill BKL") from the logfs tree and commit
05b2fc7d1f1046fef1199e1a4d2f63df998ef3aa ("drop unused dentry argument to
->fsync") from the vfs tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/logfs/logfs.h
index 6365509,c838c4d..0000000
--- a/fs/logfs/logfs.h
+++ b/fs/logfs/logfs.h
@@@ -504,9 -504,9 +504,9 @@@ extern const struct inode_operations lo
  extern const struct file_operations logfs_reg_fops;
  extern const struct address_space_operations logfs_reg_aops;
  int logfs_readpage(struct file *file, struct page *page);
 -int logfs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 -		unsigned long arg);
 +long logfs_ioctl(struct file *file, unsigned int cmd,
 +		 unsigned long arg);
- int logfs_fsync(struct file *file, struct dentry *dentry, int datasync);
+ int logfs_fsync(struct file *file, int datasync);
  
  /* gc.c */
  u32 get_best_cand(struct super_block *sb, struct candidate_list *list, u32 *ec);