block: sed-opal: fix u64 short atom length

The length must be given as bytes and not as 4 bit tuples.

Reviewed-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/sed-opal.c b/block/sed-opal.c
index 36842bfa572ea7dc5ad2d0e00e39e77070b30457..38411c5c477f01ad212aa4b1aad9e292d1c834e2 100644 (file)
--- a/block/sed-opal.c
+++ b/block/sed-opal.c
@@ -554,15 +554,14 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)
 
        size_t len;
        int msb;
-       u8 n;
 
        if (!(number & ~TINY_ATOM_DATA_MASK)) {
                add_token_u8(err, cmd, number);
                return;
        }
 
-       msb = fls(number);
-       len = DIV_ROUND_UP(msb, 4);
+       msb = fls64(number);
+       len = DIV_ROUND_UP(msb, 8);
 
        if (cmd->pos >= IO_BUFFER_LENGTH - len - 1) {
                pr_debug("Error adding u64: end of buffer.\n");
@@ -570,10 +569,8 @@ static void add_token_u64(int *err, struct opal_dev *cmd, u64 number)
                return;
        }
        add_short_atom_header(cmd, false, false, len);
-       while (len--) {
-               n = number >> (len * 8);
-               add_token_u8(err, cmd, n);
-       }
+       while (len--)
+               add_token_u8(err, cmd, number >> (len * 8));
 }
 
 static void add_token_bytestring(int *err, struct opal_dev *cmd,