apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into for-2.6.35

Browse Source 
Conflicts:
	fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2010-05-21 21:27:26 +02:00
parent b492e95be0 d515e86e63
commit ee9a3607fb
5727 changed files with 379386 additions and 149340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/block/drbd/drbd_worker.c
+1 -1
View File
@@ -240,7 +240,7 @@ void drbd_endio_pri(struct bio *bio, int error)
if (unlikely(error)) {
what = (bio_data_dir(bio) == WRITE)
? write_completed_with_error
: (bio_rw(bio) == READA)
: (bio_rw(bio) == READ)
? read_completed_with_error
: read_ahead_completed_with_error;
} else