nbd: add set cmd timeout helper

Add a helper to set the cmd timeout. It does not really do a lot now,
but will be more useful in the next patches.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index e21d2ded732b735c13f7ebbd02533ed081afe0ca..69d0e5260e1df2ea51f01e84bb704ee4f78444af 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1246,6 +1246,12 @@ static bool nbd_is_valid_blksize(unsigned long blksize)
        return true;
 }
 
+static void nbd_set_cmd_timeout(struct nbd_device *nbd, u64 timeout)
+{
+       nbd->tag_set.timeout = timeout * HZ;
+       blk_queue_rq_timeout(nbd->disk->queue, timeout * HZ);
+}
+
 /* Must be called with config_lock held */
 static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                       unsigned int cmd, unsigned long arg)
@@ -1276,10 +1282,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
                nbd_size_set(nbd, config->blksize, arg);
                return 0;
        case NBD_SET_TIMEOUT:
-               if (arg) {
-                       nbd->tag_set.timeout = arg * HZ;
-                       blk_queue_rq_timeout(nbd->disk->queue, arg * HZ);
-               }
+               if (arg)
+                       nbd_set_cmd_timeout(nbd, arg);
                return 0;
 
        case NBD_SET_FLAGS:
@@ -1799,11 +1803,9 @@ again:
        if (ret)
                goto out;
 
-       if (info->attrs[NBD_ATTR_TIMEOUT]) {
-               u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]);
-               nbd->tag_set.timeout = timeout * HZ;
-               blk_queue_rq_timeout(nbd->disk->queue, timeout * HZ);
-       }
+       if (info->attrs[NBD_ATTR_TIMEOUT])
+               nbd_set_cmd_timeout(nbd,
+                                   nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]));
        if (info->attrs[NBD_ATTR_DEAD_CONN_TIMEOUT]) {
                config->dead_conn_timeout =
                        nla_get_u64(info->attrs[NBD_ATTR_DEAD_CONN_TIMEOUT]);
@@ -1971,11 +1973,9 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
        if (ret)
                goto out;
 
-       if (info->attrs[NBD_ATTR_TIMEOUT]) {
-               u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]);
-               nbd->tag_set.timeout = timeout * HZ;
-               blk_queue_rq_timeout(nbd->disk->queue, timeout * HZ);
-       }
+       if (info->attrs[NBD_ATTR_TIMEOUT])
+               nbd_set_cmd_timeout(nbd,
+                                   nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]));
        if (info->attrs[NBD_ATTR_DEAD_CONN_TIMEOUT]) {
                config->dead_conn_timeout =
                        nla_get_u64(info->attrs[NBD_ATTR_DEAD_CONN_TIMEOUT]);