From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 02:02:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* '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.
---

bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff
diff --cc fs/xfs/linux-2.6/xfs_super.c
index 25fd2cd6c8b0,a9c6ccff7b48..9a72dda58bd0
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@@ -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;
  
@@@ -1438,8 -1432,9 +1431,7 @@@
  
  	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);
@@@ -1453,13 -1448,17 +1445,11 @@@
   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