From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Apr 2013 17:52:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: v3.9-rc7~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3792a64fdeeb9cab56c22695aaeb0624f1b295b4;p=karo-tx-linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull one more btrfs fix from Chris Mason:
 "This has a recent fix from Josef for our tree log replay code.  It
  fixes problems where the inode counter for the number of bytes in the
  file wasn't getting updated properly during fsync replay.

  The commit did get rebased this morning, but it was only to clean up
  the subject line.  The code hasn't changed."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: make sure nbytes are right after log replay
---

3792a64fdeeb9cab56c22695aaeb0624f1b295b4