Commit 99b07780 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

rnbd-srv: replace sess->open_flags with a "bool readonly" 



Stop passing the fmode_t around and just use a simple bool to track if
an export is read-only.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Acked-by: default avatarJack Wang <jinpu.wang@ionos.com>
Link: https://lore.kernel.org/r/20230608110258.189493-24-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 658afed1

drivers/block/rnbd/rnbd-srv-sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ static ssize_t read_only_show(struct kobject *kobj, struct kobj_attribute *attr, 


	sess_dev = container_of(kobj, struct rnbd_srv_sess_dev, kobj);



	return sysfs_emit(page, "%d\n",

			  !(sess_dev->open_flags & FMODE_WRITE));

	return sysfs_emit(page, "%d\n", sess_dev->readonly);

}



static struct kobj_attribute rnbd_srv_dev_session_ro_attr =

drivers/block/rnbd/rnbd-srv.c

+7 −8
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id) 
	blkdev_put(sess_dev->bdev, NULL);

	mutex_lock(&sess_dev->dev->lock);

	list_del(&sess_dev->dev_list);

	if (sess_dev->open_flags & FMODE_WRITE)

	if (!sess_dev->readonly)

		sess_dev->dev->open_write_cnt--;

	mutex_unlock(&sess_dev->dev->lock);
@@ -559,7 +559,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp, 
static struct rnbd_srv_sess_dev *

rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,

			      const struct rnbd_msg_open *open_msg,

			      struct block_device *bdev, fmode_t open_flags,

			      struct block_device *bdev, bool readonly,

			      struct rnbd_srv_dev *srv_dev)

{

	struct rnbd_srv_sess_dev *sdev = rnbd_sess_dev_alloc(srv_sess);
@@ -574,7 +574,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess, 
	sdev->bdev		= bdev;

	sdev->sess		= srv_sess;

	sdev->dev		= srv_dev;

	sdev->open_flags	= open_flags;

	sdev->readonly		= readonly;

	sdev->access_mode	= open_msg->access_mode;



	return sdev;
@@ -677,13 +677,12 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, 
	struct rnbd_srv_sess_dev *srv_sess_dev;

	const struct rnbd_msg_open *open_msg = msg;

	struct block_device *bdev;

	fmode_t open_flags;

	fmode_t open_flags = FMODE_READ;

	char *full_path;

	struct rnbd_msg_open_rsp *rsp = data;



	trace_process_msg_open(srv_sess, open_msg);



	open_flags = FMODE_READ;

	if (open_msg->access_mode != RNBD_ACCESS_RO)

		open_flags |= FMODE_WRITE;
@@ -732,8 +731,8 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, 
		goto blkdev_put;

	}



	srv_sess_dev = rnbd_srv_create_set_sess_dev(srv_sess, open_msg,

						     bdev, open_flags,

	srv_sess_dev = rnbd_srv_create_set_sess_dev(srv_sess, open_msg, bdev,

				open_msg->access_mode == RNBD_ACCESS_RO,

				srv_dev);

	if (IS_ERR(srv_sess_dev)) {

		pr_err("Opening device '%s' on session %s failed, creating sess_dev failed, err: %ld\n",

drivers/block/rnbd/rnbd-srv.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct rnbd_srv_sess_dev { 
	struct kobject                  kobj;

	u32                             device_id;

	bool				keep_id;

	fmode_t                         open_flags;

	bool				readonly;

	struct kref			kref;

	struct completion               *destroy_comp;

	char				pathname[NAME_MAX];