diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-10 03:09:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-10 03:09:18 +0100 |
| commit | 86e06008338e5712603613a0f6770500f79e83bd (patch) | |
| tree | 53d8e522e7d876b52c09bcbefac80836b3ceaa5c /fs/aio.c | |
| parent | memcg: revert fix to mapcount check for this release (diff) | |
| parent | Btrfs: fix casting error in scrub reada code (diff) | |
| download | linux-86e06008338e5712603613a0f6770500f79e83bd.tar.xz linux-86e06008338e5712603613a0f6770500f79e83bd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs updates from Chris Mason:
"I have two additional and btrfs fixes in my for-linus branch. One is
a casting error that leads to memory corruption on i386 during scrub,
and the other fixes a corner case in the backref walking code (also
triggered by scrub)."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix casting error in scrub reada code
btrfs: fix locking issues in find_parent_nodes()
Diffstat (limited to 'fs/aio.c')
0 files changed, 0 insertions, 0 deletions