author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 20 Jun 2011 15:58:53 +0000 (08:58 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 20 Jun 2011 15:58:53 +0000 (08:58 -0700) |
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: avoid delayed metadata items during commits
btrfs: fix uninitialized return value
btrfs: fix wrong reservation when doing delayed inode operations
btrfs: Remove unused sysfs code
btrfs: fix dereference of ERR_PTR value
Btrfs: fix relocation races
Btrfs: set no_trans_join after trying to expand the transaction
Btrfs: protect the pending_snapshots list with trans_lock
Btrfs: fix path leakage on subvol deletion
Btrfs: drop the delalloc_bytes check in shrink_delalloc
Btrfs: check the return value from set_anon_super
Btrfs: avoid delayed metadata items during commits
btrfs: fix uninitialized return value
btrfs: fix wrong reservation when doing delayed inode operations
btrfs: Remove unused sysfs code
btrfs: fix dereference of ERR_PTR value
Btrfs: fix relocation races
Btrfs: set no_trans_join after trying to expand the transaction
Btrfs: protect the pending_snapshots list with trans_lock
Btrfs: fix path leakage on subvol deletion
Btrfs: drop the delalloc_bytes check in shrink_delalloc
Btrfs: check the return value from set_anon_super
1 | 2 | |||
---|---|---|---|---|
fs/btrfs/ctree.h | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/inode.c | patch | | diff1 | | diff2 | | blob | history |
fs/btrfs/relocation.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/relocation.c
Simple merge