summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorChris Mason <chris.mason@fusionio.com>2013-03-07 01:46:29 +0100
committerChris Mason <chris.mason@fusionio.com>2013-03-07 01:46:29 +0100
commit2cc65e3e57d636a159d92945655b1574e47dba63 (patch)
treea86ebdd6cb7c7cfbf1d4a547df6254a1a9849ff1 /fs/ceph
parentBtrfs: enforce min_bytes parameter during extent allocation (diff)
parentBtrfs: allow running defrag in parallel to administrative tasks (diff)
downloadlinux-2cc65e3e57d636a159d92945655b1574e47dba63.tar.xz
linux-2cc65e3e57d636a159d92945655b1574e47dba63.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
Diffstat (limited to 'fs/ceph')
0 files changed, 0 insertions, 0 deletions