diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-12 01:47:06 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-12 01:47:06 (GMT) |
commit | c1f4246716392ec8693c23cffb969bd73c1b0910 (patch) | |
tree | 6160ac2507b28cf7625be79dd539a286c9fe4e43 /drivers/ata/libata-scsi.c | |
parent | fe10e6f4b24ef8ca12cb4d2368deb4861ab1861b (diff) | |
parent | 8965593e41dd2d0e2a2f1e6f245336005ea94a2c (diff) | |
download | linux-fsl-qoriq-c1f4246716392ec8693c23cffb969bd73c1b0910.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: rename the option to nospace_cache
Btrfs: handle bio_add_page failure gracefully in scrub
Btrfs: fix deadlock caused by the race between relocation
Btrfs: only map pages if we know we need them when reading the space cache
Btrfs: fix orphan backref nodes
Btrfs: Abstract similar code for btrfs_block_rsv_add{, _noflush}
Btrfs: fix unreleased path in btrfs_orphan_cleanup()
Btrfs: fix no reserved space for writing out inode cache
Btrfs: fix nocow when deleting the item
Btrfs: tweak the delayed inode reservations again
Btrfs: rework error handling in btrfs_mount()
Btrfs: close devices on all error paths in open_ctree()
Btrfs: avoid null dereference and leaks when bailing from open_ctree()
Btrfs: fix subvol_name leak on error in btrfs_mount()
Btrfs: fix memory leak in btrfs_parse_early_options()
Btrfs: fix our reservations for updating an inode when completing io
Btrfs: fix oops on NULL trans handle in btrfs_truncate
btrfs: fix double-free 'tree_root' in 'btrfs_mount()'
Diffstat (limited to 'drivers/ata/libata-scsi.c')
0 files changed, 0 insertions, 0 deletions