| Message ID | 20190925213527.9117-2-mlevitsk@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | crypto/luks: preparation for encryption key managment | expand |
On Thu, Sep 26, 2019 at 12:35:15AM +0300, Maxim Levitsky wrote: > * rename the write_func to create_write_func, > and init_func to create_init_func > this is preparation for other write_func that will > be used to update the encryption keys. > > No functional changes > > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > --- > block/crypto.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/block/crypto.c b/block/crypto.c > index 7eb698774e..6e822c6e50 100644 > --- a/block/crypto.c > +++ b/block/crypto.c > @@ -78,7 +78,7 @@ struct BlockCryptoCreateData { > }; > > > -static ssize_t block_crypto_write_func(QCryptoBlock *block, > +static ssize_t block_crypto_create_write_func(QCryptoBlock *block, > size_t offset, > const uint8_t *buf, > size_t buflen, The parameters need re-indenting when you change this name. > @@ -96,8 +96,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block, > return ret; > } > > - > -static ssize_t block_crypto_init_func(QCryptoBlock *block, > +static ssize_t block_crypto_create_init_func(QCryptoBlock *block, > size_t headerlen, > void *opaque, > Error **errp) And here I dropped this one from the pull request, so please bundle it into your other luks series Regards, Daniel
On Fri, 2019-09-27 at 11:15 +0100, Daniel P. Berrangé wrote: > On Thu, Sep 26, 2019 at 12:35:15AM +0300, Maxim Levitsky wrote: > > * rename the write_func to create_write_func, > > and init_func to create_init_func > > this is preparation for other write_func that will > > be used to update the encryption keys. > > > > No functional changes > > > > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > --- > > block/crypto.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/block/crypto.c b/block/crypto.c > > index 7eb698774e..6e822c6e50 100644 > > --- a/block/crypto.c > > +++ b/block/crypto.c > > @@ -78,7 +78,7 @@ struct BlockCryptoCreateData { > > }; > > > > > > -static ssize_t block_crypto_write_func(QCryptoBlock *block, > > +static ssize_t block_crypto_create_write_func(QCryptoBlock *block, > > size_t offset, > > const uint8_t *buf, > > size_t buflen, > > The parameters need re-indenting when you change this name. I am just blind thats all :-( I checked all the patches for the indention and still missed it :-( Will do of course. Best regards, Maxim Levitsky > > > @@ -96,8 +96,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block, > > return ret; > > } > > > > - > > -static ssize_t block_crypto_init_func(QCryptoBlock *block, > > +static ssize_t block_crypto_create_init_func(QCryptoBlock *block, > > size_t headerlen, > > void *opaque, > > Error **errp) > > And here > > I dropped this one from the pull request, so please bundle it into your > other luks series > > Regards, > Daniel
diff --git a/block/crypto.c b/block/crypto.c index 7eb698774e..6e822c6e50 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -78,7 +78,7 @@ struct BlockCryptoCreateData { }; -static ssize_t block_crypto_write_func(QCryptoBlock *block, +static ssize_t block_crypto_create_write_func(QCryptoBlock *block, size_t offset, const uint8_t *buf, size_t buflen, @@ -96,8 +96,7 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block, return ret; } - -static ssize_t block_crypto_init_func(QCryptoBlock *block, +static ssize_t block_crypto_create_init_func(QCryptoBlock *block, size_t headerlen, void *opaque, Error **errp) @@ -109,7 +108,8 @@ static ssize_t block_crypto_init_func(QCryptoBlock *block, return -EFBIG; } - /* User provided size should reflect amount of space made + /* + * User provided size should reflect amount of space made * available to the guest, so we must take account of that * which will be used by the crypto header */ @@ -279,8 +279,8 @@ static int block_crypto_co_create_generic(BlockDriverState *bs, }; crypto = qcrypto_block_create(opts, NULL, - block_crypto_init_func, - block_crypto_write_func, + block_crypto_create_init_func, + block_crypto_create_write_func, &data, errp);