[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110826120900.cdc6e4c3597c88ad45015a9b@canb.auug.org.au>
Date: Fri, 26 Aug 2011 12:09:00 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <jaxboe@...ionio.com>
Cc: "Martin K. Petersen" <martin.petersen@...cle.com>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Christoph Hellwig <hch@....de>,
LKML <linux-kernel@...r.kernel.org>, Neil Brown <neilb@...e.de>
Subject: [PATCH] bio: use a static inline function for bio_integrity_clone
When CONFIG_BLK_DEV_INTEGRITY is not set, we get these warnings:
drivers/md/dm.c: In function 'split_bvec':
drivers/md/dm.c:1061:3: warning: statement with no effect
drivers/md/dm.c: In function 'clone_bio':
drivers/md/dm.c:1088:3: warning: statement with no effect
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
include/linux/bio.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/include/linux/bio.h b/include/linux/bio.h
index ce33e68..c98ecc8 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -527,7 +527,11 @@ extern void bio_integrity_init(void);
#define bioset_integrity_create(a, b) (0)
#define bio_integrity_prep(a) (0)
#define bio_integrity_enabled(a) (0)
-#define bio_integrity_clone(a, b, c, d) (0)
+static inline int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
+ gfp_t gfp_mask, struct bio_set *bs)
+{
+ return 0;
+}
#define bioset_integrity_free(a) do { } while (0)
#define bio_integrity_free(a, b) do { } while (0)
#define bio_integrity_endio(a, b) do { } while (0)
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists