tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus

Jens Axboe 6a7cc883 be1066bb

+1 -1
unified split
+1 -1
drivers/block/drbd/drbd_worker.c
··· 235 235 if (unlikely(error)) { 236 236 what = (bio_data_dir(bio) == WRITE) 237 237 ? write_completed_with_error 238 - : (bio_rw(bio) == READA) 238 + : (bio_rw(bio) == READ) 239 239 ? read_completed_with_error 240 240 : read_ahead_completed_with_error; 241 241 } else