Merge remote-tracking branch 'logfs/master'

Conflicts:
	fs/logfs/file.c

diff --cc MAINTAINERS
Simple merge

diff --cc fs/logfs/dir.c
Simple merge

diff --cc fs/logfs/file.c
index b548c87a86f1dbe6ff3b15b185fa432697ea0096,f85d603fdffa22a978ec7af4a3e9213cd0b332d8..3886cded283c4f355f1533712efc12c5e3798c61
--- 1/fs/logfs/file.c
--- 2/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@@ -219,20 -219,13 +219,22 @@@ long logfs_ioctl(struct file *file, uns
        }
  }
  
 -int logfs_fsync(struct file *file, int datasync)
 +int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
  {
        struct super_block *sb = file->f_mapping->host->i_sb;
 +      struct inode *inode = file->f_mapping->host;
 +      int ret;
 +
 +      ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
 +      if (ret)
 +              return ret;
  
 +      mutex_lock(&inode->i_mutex);
+       logfs_get_wblocks(sb, NULL, WF_LOCK);
        logfs_write_anchor(sb);
+       logfs_put_wblocks(sb, NULL, WF_LOCK);
 +      mutex_unlock(&inode->i_mutex);
 +
        return 0;
  }
  

diff --cc fs/logfs/inode.c
Simple merge

diff --cc fs/logfs/logfs.h
Simple merge

diff --cc fs/logfs/readwrite.c
Simple merge

diff --cc fs/logfs/super.c
Simple merge