diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 11:06:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-12 11:06:36 -0700 |
commit | 3c25fa740e2084a3950f581378ec29a3c307ddfc (patch) | |
tree | 0d41fe11789be7a406e4d29c111713f75548fbc1 /fs/jfs | |
parent | 9d6fa8fa7042622f8ed9c0988de665464d4584a6 (diff) | |
parent | 30b4caf5d73af5c99cf1b2b46496d8bc35330992 (diff) | |
download | linux-3.10-3c25fa740e2084a3950f581378ec29a3c307ddfc.tar.gz linux-3.10-3c25fa740e2084a3950f581378ec29a3c307ddfc.tar.bz2 linux-3.10-3c25fa740e2084a3950f581378ec29a3c307ddfc.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: use join_transaction in btrfs_evict_inode()
Btrfs - use %pU to print fsid
Btrfs: fix extent state leak on failed nodatasum reads
btrfs: fix unlocked access of delalloc_inodes
Btrfs: avoid stack bloat in btrfs_ioctl_fs_info()
btrfs: remove 64bit alignment padding to allow extent_buffer to fit into one fewer cacheline
Btrfs: clear current->journal_info on async transaction commit
Btrfs: make sure to recheck for bitmaps in clusters
btrfs: remove unneeded includes from scrub.c
btrfs: reinitialize scrub workers
btrfs: scrub: errors in tree enumeration
Btrfs: don't map extent buffer if path->skip_locking is set
Btrfs: unlock the trans lock properly
Btrfs: don't map extent buffer if path->skip_locking is set
Btrfs: fix duplicate checking logic
Btrfs: fix the allocator loop logic
Btrfs: fix bitmap regression
Btrfs: don't commit the transaction if we dont have enough pinned bytes
Btrfs: noinline the cluster searching functions
Btrfs: cache bitmaps when searching for a cluster
Diffstat (limited to 'fs/jfs')
0 files changed, 0 insertions, 0 deletions