From: Greg Kroah-Hartman Date: Tue, 1 Oct 2013 03:46:36 +0000 (-0700) Subject: staging: lustre: fix bug with LL_MRF_RETURN in loop_make_request X-Git-Tag: firefly_0821_release~176^2~5057^2~526 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de40d1209898884ad5d15a7b5003d13f4f3263d5;p=firefly-linux-kernel-4.4.55.git staging: lustre: fix bug with LL_MRF_RETURN in loop_make_request Turns out that LL_MRF_RETURN is "void" so loop_make_request() would fall through to the error path for a successful call. Either this never matters, or the error path really doesn't do anything. Fix it up to do what the code is written to look like it is doing, if that really is what it should be doing is another story... Cc: Peng Tao Cc: Zhao Hongjiang Cc: Andreas Dilger Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h index 1644d40b2682..359c6c1ba68d 100644 --- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h +++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h @@ -232,8 +232,6 @@ static inline int ll_namei_to_lookup_intent_flag(int flag) return flag; } -# define LL_MRF_RETURN(rc) - #include # define ll_umode_t umode_t diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c index 66ed25e0efa8..e2421ea61352 100644 --- a/drivers/staging/lustre/lustre/llite/lloop.c +++ b/drivers/staging/lustre/lustre/llite/lloop.c @@ -365,10 +365,9 @@ static void loop_make_request(struct request_queue *q, struct bio *old_bio) goto err; } loop_add_bio(lo, old_bio); - LL_MRF_RETURN(0); + return; err: cfs_bio_io_error(old_bio, old_bio->bi_size); - LL_MRF_RETURN(0); }