From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Jun 2013 00:06:28 +0000 (+0900)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
X-Git-Tag: accepted/tizen/common/20141203.182822~2130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f66f9005b66a9a09028f8c85d67600b20a979ec;p=platform%2Fkernel%2Flinux-arm64.git

Merge git://git./linux/kernel/git/steve/gfs2-3.0-fixes

Pull gfs2 fixes from Steven Whitehouse:
 "There are four patches this time.

  The first fixes a problem where the wrong descriptor type was being
  written into the log for journaled data blocks.

  The second fixes a race relating to the deallocation of allocator
  data.

  The third provides a fallback if kmalloc is unable to satisfy a
  request to allocate a directory hash table.

  The fourth fixes the iopen glock caching so that inodes are deleted in
  a more timely manner after rmdir/unlink"

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: Don't cache iopen glocks
  GFS2: Fall back to vmalloc if kmalloc fails for dir hash tables
  GFS2: Increase i_writecount during gfs2_setattr_size
  GFS2: Set log descriptor type for jdata blocks
---

6f66f9005b66a9a09028f8c85d67600b20a979ec