On Mon, 4 Feb 2019, Christoph Hellwig wrote:
On Fri, Feb 01, 2019 at 09:50:10PM +0100, David Kozub wrote:From: Jonas Rabenstein <jonas.rabenstein@xxxxxxxxxxxxxxxxxxxxxxx> All add_token_* functions have a common set of conditions that have to be checked. Use a common function for those checks in order to avoid different behaviour as well as code duplication. Co-authored-by: David Kozub <zub@xxxxxxxxxxxxxxxxxx> Signed-off-by: Jonas Rabenstein <jonas.rabenstein@xxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: David Kozub <zub@xxxxxxxxxxxxxxxxxx> Reviewed-by: Scott Bauer <sbauer@xxxxxxxxxxxxxx> --- block/sed-opal.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/block/sed-opal.c b/block/sed-opal.c index 5c123a5b4ab1..980705681806 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -510,15 +510,29 @@ static int opal_discovery0(struct opal_dev *dev, void *data) return opal_discovery0_end(dev); } -static void add_token_u8(int *err, struct opal_dev *cmd, u8 tok) +static size_t remaining_size(struct opal_dev *cmd) +{ + return IO_BUFFER_LENGTH - cmd->pos; +}This function seem a little pointless to me, at least as of this patch where it only has a single user just below.
It is eventually used for the second time in 11/16 block: sed-opal: ioctl for writing to shadow mbr.
If you feel strongly about this I can exclude it from this commit and introduce it in 11/16 (where it then will called from here and from write_shadow_mbr).
Best regards, David
