Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a83e814b authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Linus Torvalds
Browse files

nbd: show read-only state in sysfs 



Pass the read-only flag to set_device_ro, so that it will be visible to
the block layer and in sysfs.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Cc: Paul Clements <Paul.Clements@steeleye.com>
Cc: Alex Bligh <alex@alex.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3a2d63f8

drivers/block/nbd.c

+3 −0
Original line number Diff line number Diff line
@@ -703,6 +703,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 


		mutex_unlock(&nbd->tx_lock);



		if (nbd->flags & NBD_FLAG_READ_ONLY)

			set_device_ro(bdev, true);

		if (nbd->flags & NBD_FLAG_SEND_TRIM)

			queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,

				nbd->disk->queue);
@@ -730,6 +732,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
		dev_warn(disk_to_dev(nbd->disk), "queue cleared\n");

		kill_bdev(bdev);

		queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);

		set_device_ro(bdev, false);

		if (file)

			fput(file);

		nbd->flags = 0;