From: Christoph Hellwig <hch@infradead.org>
To: Dmitry Monakhov <dmonakhov@openvz.org>
Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
martin.petersen@oracle.com
Subject: Re: [PATCH 5/9] bio-integrity: fold bio_integrity_enabled to bio_integrity_prep
Date: Thu, 6 Apr 2017 04:43:49 -0700 [thread overview]
Message-ID: <20170406114349.GC9312@infradead.org> (raw)
In-Reply-To: <1491332201-26926-6-git-send-email-dmonakhov@openvz.org>
> --- a/Documentation/block/data-integrity.txt
> +++ b/Documentation/block/data-integrity.txt
> @@ -202,9 +202,6 @@ will require extra work due to the application tag.
> added. It is up to the caller to ensure that the bio does not
> change while I/O is in progress.
>
> - bio_integrity_prep() should only be called if
> - bio_integrity_enabled() returned 1.
> -
This should grow a blurb that bio_integrity_prep will complete the bio
if an error occurs.
> /**
> - * bio_integrity_prep - Prepare bio for integrity I/O
> + * bio_integrity_setup - Prepare bio for integrity I/O
> * @bio: bio to prepare
> *
> * Description: Allocates a buffer for integrity metadata, maps the
> @@ -269,7 +231,7 @@ static int bio_integrity_process(struct bio *bio,
> * block device's integrity function. In the READ case, the buffer
> * will be prepared for DMA and a suitable end_io handler set up.
> */
> -int bio_integrity_prep(struct bio *bio)
> +static int bio_integrity_setup(struct bio *bio)
Instead of renaming the function I'd suggest simply merging the two,
the end result will be smaller and more readable.
> + if (bio_data_dir(bio) == READ && bi->profile->verify_fn != NULL &&
> + (bi->flags & BLK_INTEGRITY_VERIFY))
> + goto need_prep;
> +
> + if (bio_data_dir(bio) == WRITE && bi->profile->generate_fn != NULL &&
> + (bi->flags & BLK_INTEGRITY_GENERATE))
> + goto need_prep;
I'd invert the conditions to avoid the goto:
if (bio_data_dir(bio) == READ) {
if (!bi->profile->verify_fn ||
!(bi->flags & BLK_INTEGRITY_VERIFY))
return 0;
} else {
if (!bi->profile->generate_fn ||
!(bi->flags & BLK_INTEGRITY_GENERATE))
return 0;
}
next prev parent reply other threads:[~2017-04-06 11:43 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 18:56 [PATCH 0/9] block: T10/DIF Fixes and cleanups v3 Dmitry Monakhov
2017-04-04 18:56 ` [PATCH 1/9] bio-integrity: Do not allocate integrity context for bio w/o data Dmitry Monakhov
2017-04-05 6:32 ` Hannes Reinecke
2017-04-20 2:34 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 2/9] bio-integrity: bio_trim should truncate integrity vector accordingly Dmitry Monakhov
2017-04-05 6:32 ` Hannes Reinecke
2017-04-20 2:34 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 3/9] bio-integrity: bio_integrity_advance must update integrity seed Dmitry Monakhov
2017-04-05 6:34 ` Hannes Reinecke
2017-04-06 11:35 ` Christoph Hellwig
2017-04-20 2:36 ` Martin K. Petersen
2017-05-03 16:06 ` Dmitry Monakhov
2017-05-03 16:10 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 4/9] bio-integrity: fix interface for bio_integrity_trim v2 Dmitry Monakhov
2017-04-05 6:36 ` Hannes Reinecke
2017-04-06 11:36 ` Christoph Hellwig
2017-04-20 2:38 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 5/9] bio-integrity: fold bio_integrity_enabled to bio_integrity_prep Dmitry Monakhov
2017-04-05 6:37 ` Hannes Reinecke
2017-04-06 11:43 ` Christoph Hellwig [this message]
2017-04-20 2:40 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 6/9] T10: Move opencoded contants to common header Dmitry Monakhov
2017-04-05 6:37 ` Hannes Reinecke
2017-04-06 11:44 ` Christoph Hellwig
2017-04-20 2:44 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 7/9] Guard bvec iteration logic v3 Dmitry Monakhov
2017-04-05 6:39 ` Hannes Reinecke
2017-04-06 11:46 ` Christoph Hellwig
2017-04-04 18:56 ` [PATCH 8/9] bio: add bvec_iter rewind API Dmitry Monakhov
2017-04-05 6:39 ` Hannes Reinecke
2017-04-06 11:49 ` Christoph Hellwig
2017-04-20 2:51 ` Martin K. Petersen
2017-04-04 18:56 ` [PATCH 9/9] bio-integrity: Restore original iterator on verify stage Dmitry Monakhov
2017-04-05 6:41 ` Hannes Reinecke
2017-04-06 11:49 ` Christoph Hellwig
2017-05-02 7:31 ` [PATCH 0/9] block: T10/DIF Fixes and cleanups v3 Christoph Hellwig
2017-05-10 15:28 ` Dmitry Monakhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170406114349.GC9312@infradead.org \
--to=hch@infradead.org \
--cc=dmonakhov@openvz.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).