diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-16 15:50:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-16 15:50:58 -0700 |
| commit | c7309e88a694acbe9e42655f02b9dd37c7931424 (patch) | |
| tree | d4d6e55e33bf34f7759c8be1cc52b938aff68813 /fs/nfs/nfs42.h | |
| parent | 518af3cb8ccaf32057db6046e241ec393d6c7b98 (diff) | |
| parent | 062c19e9dd692b8a78e3532f71c290520a2ab437 (diff) | |
| download | op-kernel-dev-c7309e88a694acbe9e42655f02b9dd37c7931424.zip op-kernel-dev-c7309e88a694acbe9e42655f02b9dd37c7931424.tar.gz | |
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"The first commit is a fix from Filipe for a very old extent buffer
reuse race that triggered a BUG_ON. It hasn't come up often, I looked
through old logs at FB and we hit it a handful of times over the last
year.
The rest are other corners he hit during testing"
* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix race when reusing stale extent buffers that leads to BUG_ON
Btrfs: fix race between block group creation and their cache writeout
Btrfs: fix panic when starting bg cache writeout after IO error
Btrfs: fix crash after inode cache writeback failure
Diffstat (limited to 'fs/nfs/nfs42.h')
0 files changed, 0 insertions, 0 deletions
