From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2011 17:49:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~7613^2~1129
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8a0599dd2471f2a2e409498c08a0ab339057ad06;p=firefly-linux-kernel-4.4.55.git

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: correctly decrement the extent buffer index in xfs_bmap_del_extent
  xfs: check for valid indices in xfs_iext_get_ext and xfs_iext_idx_to_irec
  xfs: fix up asserts in xfs_iflush_fork
  xfs: do not do pointer arithmetic on extent records
  xfs: do not use unchecked extent indices in xfs_bunmapi
  xfs: do not use unchecked extent indices in xfs_bmapi
  xfs: do not use unchecked extent indices in xfs_bmap_add_extent_*
  xfs: remove if_lastex
  xfs: remove the unused XFS_BMAPI_RSVBLOCKS flag
  xfs: do not discard alloc btree blocks
  xfs: add online discard support
---

8a0599dd2471f2a2e409498c08a0ab339057ad06