Skip to content

Commit 030ce8b

Browse files
Gioh Kimaxboe
authored andcommitted
block/rnbd: client device does not care queue/rotational
On client side, the device is a network device. There is no reason to set rotational even-if the target device on server is rotational. Signed-off-by: Gioh Kim <[email protected]> Signed-off-by: Jack Wang <[email protected]> Signed-off-by: Md Haris Iqbal <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 4a09a84 commit 030ce8b

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

drivers/block/rnbd/rnbd-clt.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ static int rnbd_clt_set_dev_attr(struct rnbd_clt_dev *dev,
8787
dev->discard_granularity = le32_to_cpu(rsp->discard_granularity);
8888
dev->discard_alignment = le32_to_cpu(rsp->discard_alignment);
8989
dev->secure_discard = le16_to_cpu(rsp->secure_discard);
90-
dev->rotational = rsp->rotational;
9190
dev->wc = !!(rsp->cache_policy & RNBD_WRITEBACK);
9291
dev->fua = !!(rsp->cache_policy & RNBD_FUA);
9392

@@ -1410,8 +1409,10 @@ static int rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx)
14101409
dev->read_only = false;
14111410
}
14121411

1413-
if (!dev->rotational)
1414-
blk_queue_flag_set(QUEUE_FLAG_NONROT, dev->queue);
1412+
/*
1413+
* Network device does not need rotational
1414+
*/
1415+
blk_queue_flag_set(QUEUE_FLAG_NONROT, dev->queue);
14151416
err = add_disk(dev->gd);
14161417
if (err)
14171418
blk_cleanup_disk(dev->gd);
@@ -1610,13 +1611,13 @@ struct rnbd_clt_dev *rnbd_clt_map_device(const char *sessname,
16101611
}
16111612

16121613
rnbd_clt_info(dev,
1613-
"map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_write_same_sectors: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, rotational: %d, wc: %d, fua: %d)\n",
1614+
"map_device: Device mapped as %s (nsectors: %zu, logical_block_size: %d, physical_block_size: %d, max_write_same_sectors: %d, max_discard_sectors: %d, discard_granularity: %d, discard_alignment: %d, secure_discard: %d, max_segments: %d, max_hw_sectors: %d, wc: %d, fua: %d)\n",
16141615
dev->gd->disk_name, dev->nsectors,
16151616
dev->logical_block_size, dev->physical_block_size,
16161617
dev->max_write_same_sectors, dev->max_discard_sectors,
16171618
dev->discard_granularity, dev->discard_alignment,
16181619
dev->secure_discard, dev->max_segments,
1619-
dev->max_hw_sectors, dev->rotational, dev->wc, dev->fua);
1620+
dev->max_hw_sectors, dev->wc, dev->fua);
16201621

16211622
mutex_unlock(&dev->lock);
16221623
rnbd_clt_put_sess(sess);

drivers/block/rnbd/rnbd-clt.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ struct rnbd_clt_dev {
118118
enum rnbd_access_mode access_mode;
119119
u32 nr_poll_queues;
120120
bool read_only;
121-
bool rotational;
122121
bool wc;
123122
bool fua;
124123
u32 max_hw_sectors;

drivers/block/rnbd/rnbd-proto.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ enum rnbd_cache_policy {
128128
* @logical_block_size: logical block size device supports in bytes
129129
* @max_segments: max segments hardware support in one transfer
130130
* @secure_discard: supports secure discard
131-
* @rotation: is a rotational disc?
131+
* @obsolete_rotational: obsolete, not in used.
132132
* @cache_policy: support write-back caching or FUA?
133133
*/
134134
struct rnbd_msg_open_rsp {
@@ -144,7 +144,7 @@ struct rnbd_msg_open_rsp {
144144
__le16 logical_block_size;
145145
__le16 max_segments;
146146
__le16 secure_discard;
147-
u8 rotational;
147+
u8 obsolete_rotational;
148148
u8 cache_policy;
149149
u8 reserved[10];
150150
};

drivers/block/rnbd/rnbd-srv.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,6 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,
558558
cpu_to_le32(rnbd_dev_get_discard_alignment(rnbd_dev));
559559
rsp->secure_discard =
560560
cpu_to_le16(rnbd_dev_get_secure_discard(rnbd_dev));
561-
rsp->rotational = !blk_queue_nonrot(q);
562561
rsp->cache_policy = 0;
563562
if (test_bit(QUEUE_FLAG_WC, &q->queue_flags))
564563
rsp->cache_policy |= RNBD_WRITEBACK;

0 commit comments

Comments
 (0)