From: "Ewan D. Milne" <emilne@redhat.com>
To: linux-scsi@vger.kernel.org
Subject: [PATCH v2 3/8] [SCSI] Rename scsi_evt_xxx to sdev_evt_xxx and scsi_event to sdev_event
Date: Fri, 1 Feb 2013 12:53:10 -0500 [thread overview]
Message-ID: <1359741195-2641-4-git-send-email-emilne@redhat.com> (raw)
In-Reply-To: <1359741195-2641-1-git-send-email-emilne@redhat.com>
From: "Ewan D. Milne" <emilne@redhat.com>
The names of the struct and some of the functions for scsi_device
events are too generic and do not match the comments in the source.
Changed all of the names to begin with sdev_ in order to avoid
naming issues and confusion with scsi_target events to be added.
Also changed name of sdev_evt_thread() to sdev_evt_work().
Signed-off-by: Ewan D. Milne <emilne@redhat.com>
---
drivers/scsi/scsi_lib.c | 24 ++++++++++++------------
drivers/scsi/scsi_priv.h | 1 +
drivers/scsi/scsi_scan.c | 3 +--
drivers/scsi/scsi_sysfs.c | 4 ++--
include/scsi/scsi_device.h | 6 +++---
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index eba68de..75b7cad 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2175,9 +2175,9 @@ EXPORT_SYMBOL(scsi_device_set_state);
* @sdev: associated SCSI device
* @evt: event to emit
*
- * Send a single uevent (scsi_event) to the associated scsi_device.
+ * Send a single uevent (sdev_event) to the associated scsi_device.
*/
-static void scsi_evt_emit(struct scsi_device *sdev, struct scsi_event *evt)
+static void sdev_evt_emit(struct scsi_device *sdev, struct sdev_event *evt)
{
int idx = 0;
char *envp[3];
@@ -2200,13 +2200,13 @@ static void scsi_evt_emit(struct scsi_device *sdev, struct scsi_event *evt)
}
/**
- * sdev_evt_thread - send a uevent for each scsi event
+ * sdev_evt_work - send a uevent for each scsi event
* @work: work struct for scsi_device
*
* Dispatch queued events to their associated scsi_device kobjects
* as uevents.
*/
-void scsi_evt_thread(struct work_struct *work)
+void sdev_evt_work(struct work_struct *work)
{
struct scsi_device *sdev;
LIST_HEAD(event_list);
@@ -2214,7 +2214,7 @@ void scsi_evt_thread(struct work_struct *work)
sdev = container_of(work, struct scsi_device, event_work);
while (1) {
- struct scsi_event *evt;
+ struct sdev_event *evt;
struct list_head *this, *tmp;
unsigned long flags;
@@ -2226,9 +2226,9 @@ void scsi_evt_thread(struct work_struct *work)
break;
list_for_each_safe(this, tmp, &event_list) {
- evt = list_entry(this, struct scsi_event, node);
+ evt = list_entry(this, struct sdev_event, node);
list_del(&evt->node);
- scsi_evt_emit(sdev, evt);
+ sdev_evt_emit(sdev, evt);
kfree(evt);
}
}
@@ -2241,7 +2241,7 @@ void scsi_evt_thread(struct work_struct *work)
*
* Assert scsi device event asynchronously.
*/
-void sdev_evt_send(struct scsi_device *sdev, struct scsi_event *evt)
+void sdev_evt_send(struct scsi_device *sdev, struct sdev_event *evt)
{
unsigned long flags;
@@ -2267,12 +2267,12 @@ EXPORT_SYMBOL_GPL(sdev_evt_send);
* @evt_type: type of event to allocate
* @gfpflags: GFP flags for allocation
*
- * Allocates and returns a new scsi_event.
+ * Allocates and returns a new sdev_event.
*/
-struct scsi_event *sdev_evt_alloc(enum scsi_device_event evt_type,
+struct sdev_event *sdev_evt_alloc(enum scsi_device_event evt_type,
gfp_t gfpflags)
{
- struct scsi_event *evt = kzalloc(sizeof(struct scsi_event), gfpflags);
+ struct sdev_event *evt = kzalloc(sizeof(struct sdev_event), gfpflags);
if (!evt)
return NULL;
@@ -2303,7 +2303,7 @@ EXPORT_SYMBOL_GPL(sdev_evt_alloc);
void sdev_evt_send_simple(struct scsi_device *sdev,
enum scsi_device_event evt_type, gfp_t gfpflags)
{
- struct scsi_event *evt = sdev_evt_alloc(evt_type, gfpflags);
+ struct sdev_event *evt = sdev_evt_alloc(evt_type, gfpflags);
if (!evt) {
sdev_printk(KERN_ERR, sdev, "event %d eaten due to OOM\n",
evt_type);
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 07ce3f5..7f00813 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -90,6 +90,7 @@ extern void scsi_exit_queue(void);
struct request_queue;
struct request;
extern struct kmem_cache *scsi_sdb_cache;
+extern void sdev_evt_work(struct work_struct *work);
/* scsi_proc.c */
#ifdef CONFIG_SCSI_PROC_FS
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 2e5fe58..47348ed 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -244,7 +244,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
struct scsi_device *sdev;
int display_failure_msg = 1, ret;
struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
- extern void scsi_evt_thread(struct work_struct *work);
extern void scsi_requeue_run_queue(struct work_struct *work);
sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size,
@@ -267,7 +266,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
INIT_LIST_HEAD(&sdev->starved_entry);
INIT_LIST_HEAD(&sdev->event_list);
spin_lock_init(&sdev->list_lock);
- INIT_WORK(&sdev->event_work, scsi_evt_thread);
+ INIT_WORK(&sdev->event_work, sdev_evt_work);
INIT_WORK(&sdev->requeue_work, scsi_requeue_run_queue);
sdev->sdev_gendev.parent = get_device(&starget->dev);
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index ba7da3b..b22210d 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -353,9 +353,9 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
cancel_work_sync(&sdev->event_work);
list_for_each_safe(this, tmp, &sdev->event_list) {
- struct scsi_event *evt;
+ struct sdev_event *evt;
- evt = list_entry(this, struct scsi_event, node);
+ evt = list_entry(this, struct sdev_event, node);
list_del(&evt->node);
kfree(evt);
}
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index e4c964e..dad0a37 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -57,7 +57,7 @@ enum scsi_device_event {
SDEV_EVT_MAXBITS = SDEV_EVT_LAST + 1
};
-struct scsi_event {
+struct sdev_event {
enum scsi_device_event evt_type;
struct list_head node;
@@ -360,9 +360,9 @@ extern int scsi_get_vpd_page(struct scsi_device *, u8 page, unsigned char *buf,
int buf_len);
extern int scsi_device_set_state(struct scsi_device *sdev,
enum scsi_device_state state);
-extern struct scsi_event *sdev_evt_alloc(enum scsi_device_event evt_type,
+extern struct sdev_event *sdev_evt_alloc(enum scsi_device_event evt_type,
gfp_t gfpflags);
-extern void sdev_evt_send(struct scsi_device *sdev, struct scsi_event *evt);
+extern void sdev_evt_send(struct scsi_device *sdev, struct sdev_event *evt);
extern void sdev_evt_send_simple(struct scsi_device *sdev,
enum scsi_device_event evt_type, gfp_t gfpflags);
extern int scsi_device_quiesce(struct scsi_device *sdev);
--
1.7.11.7
next prev parent reply other threads:[~2013-02-01 17:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 17:53 [PATCH v2 0/8] [SCSI] Enhanced sense and Unit Attention handling Ewan D. Milne
2013-02-01 17:53 ` [PATCH v2 1/8] [SCSI] Generate uevent on sd capacity change Ewan D. Milne
2013-02-01 17:53 ` [PATCH v2 2/8] [SCSI] Add a kernel config option for enhanced Unit Attention support Ewan D. Milne
2013-02-01 17:53 ` Ewan D. Milne [this message]
2013-02-01 17:53 ` [PATCH v2 4/8] [SCSI] Add support for scsi_target events Ewan D. Milne
2013-02-01 17:53 ` [PATCH v2 5/8] [SCSI] Generate uevents for certain Unit Attention codes Ewan D. Milne
2013-02-01 17:53 ` [PATCH v2 6/8] [SCSI] Add sysfs support for enhanced Unit Attention handling Ewan D. Milne
2013-02-01 17:53 ` [PATCH v2 7/8] [SCSI] Add sense and Unit Attention generation to scsi_debug Ewan D. Milne
2013-02-01 17:53 ` [PATCH v2 8/8] [SCSI] Streamline detection of FM/EOM/ILI status Ewan D. Milne
2013-04-11 21:52 ` [PATCH v2 0/8] [SCSI] Enhanced sense and Unit Attention handling Jeremy Linton
2013-04-15 14:13 ` Ewan Milne
2013-04-15 16:20 ` Jeremy Linton
2013-04-15 16:51 ` Ewan Milne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359741195-2641-4-git-send-email-emilne@redhat.com \
--to=emilne@redhat.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).