From 5ed91ed75944762c60f422821dd2c0dba37b9745 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 16 Nov 2011 09:21:48 +0100 Subject: [PATCH] --- yaml --- r: 275567 b: refs/heads/master c: 0c614e2d3e6ee6ff13c6181f380787cea1d82d1d h: refs/heads/master i: 275565: b72477f40fa12f9acb5ec67665e76d936913af61 275563: bb3fd4af6d99a26b8b56f27fcc16d404d0cda788 275559: 552f81a6c5117662f051b75ed90d4f2e62331ef7 275551: b5a2280f8bfe7136c156681084f00401cdb02e32 v: v3 --- [refs] | 2 +- trunk/include/linux/bio.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 269ce14df5d5..69ce3f5cc220 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bb9068278ea524581237abadd41377a14717e7d +refs/heads/master: 0c614e2d3e6ee6ff13c6181f380787cea1d82d1d diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h index a3c071c9e189..d2a3cc23d828 100644 --- a/trunk/include/linux/bio.h +++ b/trunk/include/linux/bio.h @@ -519,7 +519,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)