* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Fix Xilinx SystemACE driver to handle empty CF slot block: fix memory leak in bio_clone() block: Add gfp_mask parameter to bio_integrity_clone()
Showing the changes to include (1 of 4 files). Show all
Unified · Split
| @@ -531,7 +531,7 @@ extern void bio_integrity_endio(struct bio *, int); · 530 unmodified lines | ||
| 531 | 531 | extern void bio_integrity_advance(struct bio *, unsigned int); |
| 532 | 532 | extern void bio_integrity_trim(struct bio *, unsigned int, unsigned int); |
| 533 | 533 | extern void bio_integrity_split(struct bio *, struct bio_pair *, int); |
| 534 | −extern int bio_integrity_clone(struct bio *, struct bio *, struct bio_set *); | |
| 534 | +extern int bio_integrity_clone(struct bio *, struct bio *, gfp_t, struct bio_set *); | |
| 535 | 535 | extern int bioset_integrity_create(struct bio_set *, int); |
| 536 | 536 | extern void bioset_integrity_free(struct bio_set *); |
| 537 | 537 | extern void bio_integrity_init_slab(void); |
| @@ -542,7 +542,7 @@ extern void bio_integrity_init_slab(void); · 4 unmodified lines | ||
| 542 | 542 | #define bioset_integrity_create(a, b) (0) |
| 543 | 543 | #define bio_integrity_prep(a) (0) |
| 544 | 544 | #define bio_integrity_enabled(a) (0) |
| 545 | −#define bio_integrity_clone(a, b, c) (0) | |
| 545 | +#define bio_integrity_clone(a, b, c,d ) (0) | |
| 546 | 546 | #define bioset_integrity_free(a) do { } while (0) |
| 547 | 547 | #define bio_integrity_free(a, b) do { } while (0) |
| 548 | 548 | #define bio_integrity_endio(a, b) do { } while (0) |