git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xfs: split inode flushing from xfs_sync_inodes_ag
[safe/jmp/linux-2.6]
/
fs
/
bio.c
diff --git
a/fs/bio.c
b/fs/bio.c
index
9cc1430
..
a040cde
100644
(file)
--- a/
fs/bio.c
+++ b/
fs/bio.c
@@
-248,7
+248,7
@@
void bio_free(struct bio *bio, struct bio_set *bs)
bvec_free_bs(bs, bio->bi_io_vec, BIO_POOL_IDX(bio));
if (bio_integrity(bio))
bvec_free_bs(bs, bio->bi_io_vec, BIO_POOL_IDX(bio));
if (bio_integrity(bio))
- bio_integrity_free(bio
, bs
);
+ bio_integrity_free(bio);
/*
* If we have front padding, adjust the bio pointer before freeing
/*
* If we have front padding, adjust the bio pointer before freeing
@@
-466,7
+466,7
@@
struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask)
if (bio_integrity(bio)) {
int ret;
if (bio_integrity(bio)) {
int ret;
- ret = bio_integrity_clone(b, bio, gfp_mask
, fs_bio_set
);
+ ret = bio_integrity_clone(b, bio, gfp_mask);
if (ret < 0) {
bio_put(b);
if (ret < 0) {
bio_put(b);
@@
-1529,7
+1529,6
@@
void bioset_free(struct bio_set *bs)
if (bs->bio_pool)
mempool_destroy(bs->bio_pool);
if (bs->bio_pool)
mempool_destroy(bs->bio_pool);
- bioset_integrity_free(bs);
biovec_free_pools(bs);
bio_put_slab(bs);
biovec_free_pools(bs);
bio_put_slab(bs);
@@
-1570,9
+1569,6
@@
struct bio_set *bioset_create(unsigned int pool_size, unsigned int front_pad)
if (!bs->bio_pool)
goto bad;
if (!bs->bio_pool)
goto bad;
- if (bioset_integrity_create(bs, pool_size))
- goto bad;
-
if (!biovec_create_pools(bs, pool_size))
return bs;
if (!biovec_create_pools(bs, pool_size))
return bs;
@@
-1610,7
+1606,6
@@
static int __init init_bio(void)
if (!bio_slabs)
panic("bio: can't allocate bios\n");
if (!bio_slabs)
panic("bio: can't allocate bios\n");
- bio_integrity_init_slab();
biovec_init_slabs();
fs_bio_set = bioset_create(BIO_POOL_SIZE, 0);
biovec_init_slabs();
fs_bio_set = bioset_create(BIO_POOL_SIZE, 0);