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

Commit bf0f9702 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: sysfs store function needs to grab queue_lock and use queue_flag_*() 



Concurrency isn't a big deal here since we have requests in flight
at this point, but do the locked variant to set a better example.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent c0a18111

block/blk-sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -146,11 +146,13 @@ static ssize_t queue_nomerges_store(struct request_queue *q, const char *page, 
	unsigned long nm;

	ssize_t ret = queue_var_store(&nm, page, count);



	spin_lock_irq(q->queue_lock);

	if (nm)

	       set_bit(QUEUE_FLAG_NOMERGES, &q->queue_flags);

		queue_flag_set(QUEUE_FLAG_NOMERGES, q);

	else

	       clear_bit(QUEUE_FLAG_NOMERGES, &q->queue_flags);

		queue_flag_clear(QUEUE_FLAG_NOMERGES, q);



	spin_unlock_irq(q->queue_lock);

	return ret;

}