Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: integrity checkpatch cleanups

> 80 char lines and that sort of thing.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

+25 -12
+5 -3
block/blk-integrity.c
··· 178 178 return entry->show(bi, page); 179 179 } 180 180 181 - static ssize_t integrity_attr_store(struct kobject *kobj, struct attribute *attr, 182 - const char *page, size_t count) 181 + static ssize_t integrity_attr_store(struct kobject *kobj, 182 + struct attribute *attr, const char *page, 183 + size_t count) 183 184 { 184 185 struct blk_integrity *bi = 185 186 container_of(kobj, struct blk_integrity, kobj); ··· 327 326 BUG_ON(template == NULL); 328 327 329 328 if (disk->integrity == NULL) { 330 - bi = kmem_cache_alloc(integrity_cachep, GFP_KERNEL | __GFP_ZERO); 329 + bi = kmem_cache_alloc(integrity_cachep, 330 + GFP_KERNEL | __GFP_ZERO); 331 331 if (!bi) 332 332 return -1; 333 333
+20 -9
fs/bio-integrity.c
··· 39 39 * metadata. nr_vecs specifies the maximum number of pages containing 40 40 * integrity metadata that can be attached. 41 41 */ 42 - struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *bio, gfp_t gfp_mask, unsigned int nr_vecs, struct bio_set *bs) 42 + struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *bio, 43 + gfp_t gfp_mask, 44 + unsigned int nr_vecs, 45 + struct bio_set *bs) 43 46 { 44 47 struct bio_integrity_payload *bip; 45 48 struct bio_vec *iv; ··· 84 81 * metadata. nr_vecs specifies the maximum number of pages containing 85 82 * integrity metadata that can be attached. 86 83 */ 87 - struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, gfp_t gfp_mask, unsigned int nr_vecs) 84 + struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, 85 + gfp_t gfp_mask, 86 + unsigned int nr_vecs) 88 87 { 89 88 return bio_integrity_alloc_bioset(bio, gfp_mask, nr_vecs, fs_bio_set); 90 89 } ··· 179 174 * sector size of the storage device. Convert the block layer sectors 180 175 * to physical sectors. 181 176 */ 182 - static inline unsigned int bio_integrity_hw_sectors(struct blk_integrity *bi, unsigned int sectors) 177 + static inline unsigned int bio_integrity_hw_sectors(struct blk_integrity *bi, 178 + unsigned int sectors) 183 179 { 184 180 /* At this point there are only 512b or 4096b DIF/EPP devices */ 185 181 if (bi->sector_size == 4096) ··· 218 212 if (bi->tag_size == 0) 219 213 return -1; 220 214 221 - nr_sectors = bio_integrity_hw_sectors(bi, DIV_ROUND_UP(len, bi->tag_size)); 215 + nr_sectors = bio_integrity_hw_sectors(bi, 216 + DIV_ROUND_UP(len, bi->tag_size)); 222 217 223 218 if (nr_sectors * bi->tuple_size > bip->bip_size) { 224 219 printk(KERN_ERR "%s: tag too big for bio: %u > %u\n", ··· 463 456 */ 464 457 static void bio_integrity_verify_fn(struct work_struct *work) 465 458 { 466 - struct bio_integrity_payload *bip = 459 + struct bio_integrity_payload *bip = 467 460 container_of(work, struct bio_integrity_payload, bip_work); 468 461 struct bio *bio = bip->bip_bio; 469 462 int error = bip->bip_error; ··· 509 502 * @bip: Integrity vector to advance 510 503 * @skip: Number of bytes to advance it 511 504 */ 512 - void bio_integrity_mark_head(struct bio_integrity_payload *bip, unsigned int skip) 505 + void bio_integrity_mark_head(struct bio_integrity_payload *bip, 506 + unsigned int skip) 513 507 { 514 508 struct bio_vec *iv; 515 509 unsigned int i; ··· 535 527 * @bip: Integrity vector to truncate 536 528 * @len: New length of integrity vector 537 529 */ 538 - void bio_integrity_mark_tail(struct bio_integrity_payload *bip, unsigned int len) 530 + void bio_integrity_mark_tail(struct bio_integrity_payload *bip, 531 + unsigned int len) 539 532 { 540 533 struct bio_vec *iv; 541 534 unsigned int i; ··· 588 579 * and the length will be truncated corresponding to 'len' data 589 580 * sectors. 590 581 */ 591 - void bio_integrity_trim(struct bio *bio, unsigned int offset, unsigned int sectors) 582 + void bio_integrity_trim(struct bio *bio, unsigned int offset, 583 + unsigned int sectors) 592 584 { 593 585 struct bio_integrity_payload *bip = bio->bi_integrity; 594 586 struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); ··· 658 648 * 659 649 * Description: Called to allocate a bip when cloning a bio 660 650 */ 661 - int bio_integrity_clone(struct bio *bio, struct bio *bio_src, struct bio_set *bs) 651 + int bio_integrity_clone(struct bio *bio, struct bio *bio_src, 652 + struct bio_set *bs) 662 653 { 663 654 struct bio_integrity_payload *bip_src = bio_src->bi_integrity; 664 655 struct bio_integrity_payload *bip;