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

Pull XFS update (part 2) from Ben Myers:
 "Fixes for tracing of xfs_name strings, flag handling in
  open_by_handle, a log space hang with freeze/unfreeze, fstrim offset
  calculations, a section mismatch with xfs_qm_exit, an oops in
  xlog_recover_process_iunlinks, and a deadlock in xfs_rtfree_extent.

  There are also additional trace points for attributes, and the
  addition of a workqueue for allocation to work around kernel stack
  size limitations."

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: add lots of attribute trace points
  xfs: Fix oops on IO error during xlog_recover_process_iunlinks()
  xfs: fix fstrim offset calculations
  xfs: Account log unmount transaction correctly
  xfs: don't cache inodes read through bulkstat
  xfs: trace xfs_name strings correctly
  xfs: introduce an allocation workqueue
  xfs: Fix open flag handling in open_by_handle code
  xfs: fix deadlock in xfs_rtfree_extent
  fs: xfs: fix section mismatch in linux-next

1 files changed, 6 insertions, 2 deletions

diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index a98cb4524e6c..bcc6c249b2c7 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -289,7 +289,7 @@ xfs_iget_cache_hit(
         if (lock_flags != 0)
                 xfs_ilock(ip, lock_flags);
 
-        xfs_iflags_clear(ip, XFS_ISTALE);
+        xfs_iflags_clear(ip, XFS_ISTALE | XFS_IDONTCACHE);
         XFS_STATS_INC(xs_ig_found);
 
         return 0;
@@ -314,6 +314,7 @@ xfs_iget_cache_miss(
         struct xfs_inode        *ip;
         int                     error;
         xfs_agino_t             agino = XFS_INO_TO_AGINO(mp, ino);
+        int                     iflags;
 
         ip = xfs_inode_alloc(mp, ino);
         if (!ip)
@@ -358,8 +359,11 @@ xfs_iget_cache_miss(
          * memory barrier that ensures this detection works correctly at lookup
          * time.
          */
+        iflags = XFS_INEW;
+        if (flags & XFS_IGET_DONTCACHE)
+                iflags |= XFS_IDONTCACHE;
         ip->i_udquot = ip->i_gdquot = NULL;
-        xfs_iflags_set(ip, XFS_INEW);
+        xfs_iflags_set(ip, iflags);
 
         /* insert the new inode */
         spin_lock(&pag->pag_ici_lock);