Commit 5109ea60 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: get rid of cfs_bio_* compat macroses 



This replaces cfs_bio_io_error with direct calls to bio_io_error
and cfs_bio_end_io with bio_end_io

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b921ecea

drivers/staging/lustre/lustre/include/linux/lustre_compat25.h

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ 
#define FS_HAS_FIEMAP			(0)

#endif



#define cfs_bio_io_error(a, b)   bio_io_error((a))

#define cfs_bio_endio(a, b, c)    bio_endio((a), (c))





#ifndef SLAB_DESTROY_BY_RCU

#define SLAB_DESTROY_BY_RCU 0

#endif

drivers/staging/lustre/lustre/llite/lloop.c

+2 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio) 
	loop_add_bio(lo, old_bio);

	return;

err:

	cfs_bio_io_error(old_bio, old_bio->bi_iter.bi_size);

	bio_io_error(old_bio);

}
@@ -376,7 +376,7 @@ static inline void loop_handle_bio(struct lloop_device *lo, struct bio *bio) 
	while (bio) {

		struct bio *tmp = bio->bi_next;

		bio->bi_next = NULL;

		cfs_bio_endio(bio, bio->bi_iter.bi_size, ret);

		bio_endio(bio, ret);

		bio = tmp;

	}

}