From 01fb6e1b5d52231dfc6bab92e855e3c8b08ed56a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 22 Aug 2004 23:17:08 -0700 Subject: [PATCH] KREF: make kref_get() return void as it makes sense to do so. Thanks to Kiran for bugging me to do this. Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/sd.c | 4 +--- drivers/scsi/sr.c | 4 +--- include/linux/kref.h | 2 +- lib/kref.c | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 73b7ba984706b..01063e40886e9 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -180,8 +180,7 @@ static struct scsi_disk *scsi_disk_get(struct gendisk *disk) if (disk->private_data == NULL) goto out; sdkp = scsi_disk(disk); - if (!kref_get(&sdkp->kref)) - goto out_sdkp; + kref_get(&sdkp->kref); if (scsi_device_get(sdkp->device)) goto out_put; up(&sd_ref_sem); @@ -189,7 +188,6 @@ static struct scsi_disk *scsi_disk_get(struct gendisk *disk) out_put: kref_put(&sdkp->kref, scsi_disk_release); - out_sdkp: sdkp = NULL; out: up(&sd_ref_sem); diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index eff8b5722eb6d..4252c5c7d21ff 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -140,15 +140,13 @@ static inline struct scsi_cd *scsi_cd_get(struct gendisk *disk) if (disk->private_data == NULL) goto out; cd = scsi_cd(disk); - if (!kref_get(&cd->kref)) - goto out_null; + kref_get(&cd->kref); if (scsi_device_get(cd->device)) goto out_put; goto out; out_put: kref_put(&cd->kref, sr_kref_release); - out_null: cd = NULL; out: up(&sr_ref_sem); diff --git a/include/linux/kref.h b/include/linux/kref.h index ca24d61b95e6d..119c74eca194a 100644 --- a/include/linux/kref.h +++ b/include/linux/kref.h @@ -23,7 +23,7 @@ struct kref { }; void kref_init(struct kref *kref); -struct kref *kref_get(struct kref *kref); +void kref_get(struct kref *kref); void kref_put(struct kref *kref, void (*release) (struct kref *kref)); #endif /* _KREF_H_ */ diff --git a/lib/kref.c b/lib/kref.c index 1015d5ee698c1..2218b7ae7db6f 100644 --- a/lib/kref.c +++ b/lib/kref.c @@ -27,11 +27,10 @@ void kref_init(struct kref *kref) * kref_get - increment refcount for object. * @kref: object. */ -struct kref *kref_get(struct kref *kref) +void kref_get(struct kref *kref) { WARN_ON(!atomic_read(&kref->refcount)); atomic_inc(&kref->refcount); - return kref; } /** -- 2.53.0