Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (87 commits)
  [XFS] Fix merge failure
  [XFS] The forward declarations for the xfs_ioctl() helpers and the
  [XFS] Update XFS documentation for noikeep/ikeep.
  [XFS] Update XFS Documentation for ikeep and ihashsize
  [XFS] Remove unused HAVE_SPLICE macro.
  [XFS] Remove CONFIG_XFS_SECURITY.
  [XFS] xfs_bmap_compute_maxlevels should be based on di_forkoff
  [XFS] Always use di_forkoff when checking for attr space.
  [XFS] Ensure the inode is joined in xfs_itruncate_finish
  [XFS] Remove periodic logging of in-core superblock counters.
  [XFS] fix logic error in xfs_alloc_ag_vextent_near()
  [XFS] Don't error out on good I/Os.
  [XFS] Catch log unmount failures.
  [XFS] Sanitise xfs_log_force error checking.
  [XFS] Check for errors when changing buffer pointers.
  [XFS] Don't allow silent errors in xfs_inactive().
  [XFS] Catch errors from xfs_imap().
  [XFS] xfs_bulkstat_one_dinode() never returns an error.
  [XFS] xfs_iflush_fork() never returns an error.
  [XFS] Catch unwritten extent conversion errors.
  ...

1 files changed, 7 insertions, 8 deletions

diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 74aeb142ae5f..0a1668ba2600 100644
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -52,16 +52,15 @@ When mounting an XFS filesystem, the following options are accepted.
         and also gets the setgid bit set if it is a directory itself.
 
   ihashsize=value
-        Sets the number of hash buckets available for hashing the
-        in-memory inodes of the specified mount point.  If a value
-        of zero is used, the value selected by the default algorithm
-        will be displayed in /proc/mounts.
+        In memory inode hashes have been removed, so this option has
+        no function as of August 2007. Option is deprecated.
 
   ikeep/noikeep
-        When inode clusters are emptied of inodes, keep them around
-        on the disk (ikeep) - this is the traditional XFS behaviour
-        and is still the default for now.  Using the noikeep option,
-        inode clusters are returned to the free space pool.
+        When ikeep is specified, XFS does not delete empty inode clusters
+        and keeps them around on disk. ikeep is the traditional XFS
+        behaviour. When noikeep is specified, empty inode clusters
+        are returned to the free space pool. The default is noikeep for
+        non-DMAPI mounts, while ikeep is the default when DMAPI is in use.
 
   inode64
         Indicates that XFS is allowed to create inodes at any location