diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-06 10:20:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-06 10:20:07 -0700 |
| commit | 271fd5d7286eb931142402c170943d14640bb922 (patch) | |
| tree | dc60c1623f63a7db588de4c3c7362a9ac7abf56a /arch/x86 | |
| parent | ce7e5d2d19bc371e1b67826bfbc79bbcbaa9772f (diff) | |
| parent | b9fab919b748c7b39c19ff236ed6c5682c266dde (diff) | |
| download | linux-3.10-271fd5d7286eb931142402c170943d14640bb922.tar.gz linux-3.10-271fd5d7286eb931142402c170943d14640bb922.tar.bz2 linux-3.10-271fd5d7286eb931142402c170943d14640bb922.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"The big ones here are a memory leak we introduced in rc1, and a
scheduling while atomic if the transid on disk doesn't match the
transid we expected. This happens for corrupt blocks, or out of date
disks.
It also fixes up the ioctl definition for our ioctl to resolve logical
inode numbers. The __u32 was a merging error and doesn't match what
we ship in the progs."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: avoid sleeping in verify_parent_transid while atomic
Btrfs: fix crash in scrub repair code when device is missing
btrfs: Fix mismatching struct members in ioctl.h
Btrfs: fix page leak when allocing extent buffers
Btrfs: Add properly locking around add_root_to_dirty_list
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions