diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
commit | 8937b7349ca9e25a02b2a72ccb7fba404ddedc5b (patch) | |
tree | 434ffe23d318f8af55850a26c3431ce8b82ab6f4 /fs/bio.c | |
parent | 997302259f386bca8fe1db67c50296ca426c438f (diff) | |
parent | ffe7f95bb1a4d1e9ca5d252445dc38476e1a208e (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'fs/bio.c')
-rw-r--r-- | fs/bio.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -463,10 +463,12 @@ struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask) | |||
463 | if (bio_integrity(bio)) { | 463 | if (bio_integrity(bio)) { |
464 | int ret; | 464 | int ret; |
465 | 465 | ||
466 | ret = bio_integrity_clone(b, bio, fs_bio_set); | 466 | ret = bio_integrity_clone(b, bio, gfp_mask, fs_bio_set); |
467 | 467 | ||
468 | if (ret < 0) | 468 | if (ret < 0) { |
469 | bio_put(b); | ||
469 | return NULL; | 470 | return NULL; |
471 | } | ||
470 | } | 472 | } |
471 | 473 | ||
472 | return b; | 474 | return b; |