Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1306792

[PATCH] blkcg: put module reference

Show all headers | View raw

get_gendisk(and get_disk) increases module reference, but put_disk
doesn't decrease the reference. The module reference really should be
decreased in put_disk(), but there are a lot of cases drivers do
alloc_disk/put_disk. Before the put_disk usages are cleaned up, this is
easiest fix.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 block/blk-cgroup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 5a37188..58744ad 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -804,6 +804,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
 	if (!disk)
 		return -ENODEV;
 	if (part) {
+		module_put(disk->fops->owner);
 		put_disk(disk);
 		return -ENODEV;
 	}
@@ -820,6 +821,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
 		ret = PTR_ERR(blkg);
 		rcu_read_unlock();
 		spin_unlock_irq(disk->queue->queue_lock);
+		module_put(disk->fops->owner);
 		put_disk(disk);
 		/*
 		 * If queue was bypassing, we should retry.  Do so after a
@@ -853,6 +855,7 @@ void blkg_conf_finish(struct blkg_conf_ctx *ctx)
 {
 	spin_unlock_irq(ctx->disk->queue->queue_lock);
 	rcu_read_unlock();
+	module_put(ctx->disk->fops->owner);
 	put_disk(ctx->disk);
 }
 EXPORT_SYMBOL_GPL(blkg_conf_finish);
-- 
2.4.6

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] blkcg: put module reference Shaohua Li <shli@fb.com> - 2016-01-11 23:50 +0100

csiph-web