summaryrefslogtreecommitdiffstats
path: root/fs/jbd
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-10-24 22:06:02 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-10-24 22:06:02 +0200
commitf253b86b4ad1b3220544e75880510fd455ebd23f (patch)
treecc2dd76b8ffc8df4356c1e95bd15276169dd335e /fs/jbd
parentMerge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block (diff)
downloadlinux-f253b86b4ad1b3220544e75880510fd455ebd23f.tar.xz
linux-f253b86b4ad1b3220544e75880510fd455ebd23f.zip
Revert "block: fix accounting bug on cross partition merges"
This reverts commit 7681bfeeccff5efa9eb29bf09249a3c400b15327. Conflicts: include/linux/genhd.h It has numerous issues with the cleanup path and non-elevator devices. Revert it for now so we can come up with a clean version without rushing things. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/jbd')
0 files changed, 0 insertions, 0 deletions