Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Sat, 23 Jul 2011 02:02:39 +0000 (19:02 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (107 commits)
  vfs: use ERR_CAST for err-ptr tossing in lookup_instantiate_filp
  isofs: Remove global fs lock
  jffs2: fix IN_DELETE_SELF on overwriting rename() killing a directory
  fix IN_DELETE_SELF on overwriting rename() on ramfs et.al.
  mm/truncate.c: fix build for CONFIG_BLOCK not enabled
  fs:update the NOTE of the file_operations structure
  Remove dead code in dget_parent()
  AFS: Fix silly characters in a comment
  switch d_add_ci() to d_splice_alias() in "found negative" case as well
  simplify gfs2_lookup()
  jfs_lookup(): don't bother with . or ..
  get rid of useless dget_parent() in btrfs rename() and link()
  get rid of useless dget_parent() in fs/btrfs/ioctl.c
  fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers
  drivers: fix up various ->llseek() implementations
  fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek
  Ext4: handle SEEK_HOLE/SEEK_DATA generically
  Btrfs: implement our own ->llseek
  fs: add SEEK_HOLE and SEEK_DATA flags
  reiserfs: make reiserfs default to barrier=flush
  ...

Fix up trivial conflicts in fs/xfs/linux-2.6/xfs_super.c due to the new
shrinker callout for the inode cache, that clashed with the xfs code to
start the periodic workers later.

20 files changed:
1  2 
fs/cifs/file.c
fs/dcache.c
fs/exec.c
fs/gfs2/bmap.c
fs/gfs2/file.c
fs/hfsplus/hfsplus_fs.h
fs/hfsplus/inode.c
fs/proc/base.c
fs/ubifs/file.c
fs/ubifs/ubifs.h
fs/xfs/linux-2.6/xfs_acl.c
fs/xfs/linux-2.6/xfs_aops.c
fs/xfs/linux-2.6/xfs_file.c
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/linux-2.6/xfs_sync.c
fs/xfs/linux-2.6/xfs_sync.h
include/linux/mm.h
kernel/fork.c
net/sunrpc/clnt.c
security/selinux/hooks.c

diff --cc fs/cifs/file.c
Simple merge
diff --cc fs/dcache.c
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/gfs2/bmap.c
Simple merge
diff --cc fs/gfs2/file.c
Simple merge
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc fs/ubifs/file.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1411,9 -1407,7 +1406,7 @@@ xfs_fs_fill_super
        sb->s_time_gran = 1;
        set_posix_acl_flag(sb);
  
-       xfs_inode_shrinker_register(mp);
 -      error = xfs_syncd_init(mp);
 +      error = xfs_mountfs(mp);
        if (error)
                goto out_filestream_unmount;
  
  
        return 0;
  
 - out_syncd_stop:
 -      xfs_syncd_stop(mp);
   out_filestream_unmount:
-       xfs_inode_shrinker_unregister(mp);
        xfs_filestream_unmount(mp);
   out_free_sb:
        xfs_freesb(mp);
   out:
        return -error;
  
 - fail_vnrele:
 -      if (sb->s_root) {
 -              dput(sb->s_root);
 -              sb->s_root = NULL;
 -      } else {
 -              iput(root);
 -      }
 -
 - fail_unmount:
 + out_iput:
 +      iput(root);
 + out_syncd_stop:
        xfs_syncd_stop(mp);
 -
 + out_unmount:
-       xfs_inode_shrinker_unregister(mp);
        /*
         * Blow away any referenced inode in the filestreams cache.
         * This can and will cause log traffic as inodes go inactive
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
Simple merge