From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Mar 2012 22:23:52 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: MMI-PSA29.97-13-9~17137
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5