From: David Miller <davem@davemloft.net>
To: ebiederm@xmission.com
Cc: gregkh@suse.de, James.Bottomley@suse.de,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] scsi: Add lockdep annotations to FC sysfs attributes.
Date: Sat, 10 Apr 2010 21:40:24 -0700 (PDT) [thread overview]
Message-ID: <20100410.214024.228295222.davem@davemloft.net> (raw)
They are allocated dynamically, and thus need sysfs_attr_init()
treatment.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 1d5b721..5f10ed2 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -775,6 +775,7 @@ static FC_DEVICE_ATTR(rport, title, S_IRUGO, \
#define SETUP_RPORT_ATTRIBUTE_RD(field) \
i->private_rport_attrs[count] = device_attr_rport_##field; \
i->private_rport_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_rport_attrs[count].attr); \
i->private_rport_attrs[count].store = NULL; \
i->rport_attrs[count] = &i->private_rport_attrs[count]; \
if (i->f->show_rport_##field) \
@@ -783,6 +784,7 @@ static FC_DEVICE_ATTR(rport, title, S_IRUGO, \
#define SETUP_PRIVATE_RPORT_ATTRIBUTE_RD(field) \
i->private_rport_attrs[count] = device_attr_rport_##field; \
i->private_rport_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_rport_attrs[count].attr); \
i->private_rport_attrs[count].store = NULL; \
i->rport_attrs[count] = &i->private_rport_attrs[count]; \
count++
@@ -793,13 +795,15 @@ static FC_DEVICE_ATTR(rport, title, S_IRUGO, \
i->private_rport_attrs[count].attr.mode = S_IRUGO; \
i->private_rport_attrs[count].store = NULL; \
} \
+ sysfs_attr_init(&i->private_rport_attrs[count].attr); \
i->rport_attrs[count] = &i->private_rport_attrs[count]; \
if (i->f->show_rport_##field) \
count++
#define SETUP_PRIVATE_RPORT_ATTRIBUTE_RW(field) \
{ \
- i->private_rport_attrs[count] = device_attr_rport_##field; \
+ i->private_rport_attrs[count] = device_attr_rport_##field; \
+ sysfs_attr_init(&i->private_rport_attrs[count].attr); \
i->rport_attrs[count] = &i->private_rport_attrs[count]; \
count++; \
}
@@ -992,6 +996,7 @@ static FC_DEVICE_ATTR(starget, field, S_IRUGO, \
#define SETUP_STARGET_ATTRIBUTE_RD(field) \
i->private_starget_attrs[count] = device_attr_starget_##field; \
i->private_starget_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_starget_attrs[count].attr); \
i->private_starget_attrs[count].store = NULL; \
i->starget_attrs[count] = &i->private_starget_attrs[count]; \
if (i->f->show_starget_##field) \
@@ -1003,6 +1008,7 @@ static FC_DEVICE_ATTR(starget, field, S_IRUGO, \
i->private_starget_attrs[count].attr.mode = S_IRUGO; \
i->private_starget_attrs[count].store = NULL; \
} \
+ sysfs_attr_init(&i->private_starget_attrs[count].attr); \
i->starget_attrs[count] = &i->private_starget_attrs[count]; \
if (i->f->show_starget_##field) \
count++
@@ -1155,6 +1161,7 @@ static FC_DEVICE_ATTR(vport, title, S_IRUGO, \
#define SETUP_VPORT_ATTRIBUTE_RD(field) \
i->private_vport_attrs[count] = device_attr_vport_##field; \
i->private_vport_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_vport_attrs[count].attr); \
i->private_vport_attrs[count].store = NULL; \
i->vport_attrs[count] = &i->private_vport_attrs[count]; \
if (i->f->get_##field) \
@@ -1164,12 +1171,14 @@ static FC_DEVICE_ATTR(vport, title, S_IRUGO, \
#define SETUP_PRIVATE_VPORT_ATTRIBUTE_RD(field) \
i->private_vport_attrs[count] = device_attr_vport_##field; \
i->private_vport_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_vport_attrs[count].attr); \
i->private_vport_attrs[count].store = NULL; \
i->vport_attrs[count] = &i->private_vport_attrs[count]; \
count++
#define SETUP_VPORT_ATTRIBUTE_WR(field) \
- i->private_vport_attrs[count] = device_attr_vport_##field; \
+ i->private_vport_attrs[count] = device_attr_vport_##field; \
+ sysfs_attr_init(&i->private_vport_attrs[count].attr); \
i->vport_attrs[count] = &i->private_vport_attrs[count]; \
if (i->f->field) \
count++
@@ -1181,13 +1190,15 @@ static FC_DEVICE_ATTR(vport, title, S_IRUGO, \
i->private_vport_attrs[count].attr.mode = S_IRUGO; \
i->private_vport_attrs[count].store = NULL; \
} \
+ sysfs_attr_init(&i->private_vport_attrs[count].attr); \
i->vport_attrs[count] = &i->private_vport_attrs[count]; \
count++
/* NOTE: Above MACRO differs: does not check show bit */
#define SETUP_PRIVATE_VPORT_ATTRIBUTE_RW(field) \
{ \
- i->private_vport_attrs[count] = device_attr_vport_##field; \
+ i->private_vport_attrs[count] = device_attr_vport_##field; \
+ sysfs_attr_init(&i->private_vport_attrs[count].attr); \
i->vport_attrs[count] = &i->private_vport_attrs[count]; \
count++; \
}
@@ -1373,6 +1384,7 @@ static FC_DEVICE_ATTR(host, title, S_IRUGO, show_fc_host_##title, NULL)
#define SETUP_HOST_ATTRIBUTE_RD(field) \
i->private_host_attrs[count] = device_attr_host_##field; \
i->private_host_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_host_attrs[count].attr); \
i->private_host_attrs[count].store = NULL; \
i->host_attrs[count] = &i->private_host_attrs[count]; \
if (i->f->show_host_##field) \
@@ -1381,6 +1393,7 @@ static FC_DEVICE_ATTR(host, title, S_IRUGO, show_fc_host_##title, NULL)
#define SETUP_HOST_ATTRIBUTE_RD_NS(field) \
i->private_host_attrs[count] = device_attr_host_##field; \
i->private_host_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_host_attrs[count].attr); \
i->private_host_attrs[count].store = NULL; \
i->host_attrs[count] = &i->private_host_attrs[count]; \
count++
@@ -1391,6 +1404,7 @@ static FC_DEVICE_ATTR(host, title, S_IRUGO, show_fc_host_##title, NULL)
i->private_host_attrs[count].attr.mode = S_IRUGO; \
i->private_host_attrs[count].store = NULL; \
} \
+ sysfs_attr_init(&i->private_host_attrs[count].attr); \
i->host_attrs[count] = &i->private_host_attrs[count]; \
if (i->f->show_host_##field) \
count++
@@ -1418,6 +1432,7 @@ static FC_DEVICE_ATTR(host, field, S_IRUGO, \
#define SETUP_PRIVATE_HOST_ATTRIBUTE_RD(field) \
i->private_host_attrs[count] = device_attr_host_##field; \
i->private_host_attrs[count].attr.mode = S_IRUGO; \
+ sysfs_attr_init(&i->private_host_attrs[count].attr); \
i->private_host_attrs[count].store = NULL; \
i->host_attrs[count] = &i->private_host_attrs[count]; \
count++
@@ -1425,6 +1440,7 @@ static FC_DEVICE_ATTR(host, field, S_IRUGO, \
#define SETUP_PRIVATE_HOST_ATTRIBUTE_RW(field) \
{ \
i->private_host_attrs[count] = device_attr_host_##field; \
+ sysfs_attr_init(&i->private_host_attrs[count].attr); \
i->host_attrs[count] = &i->private_host_attrs[count]; \
count++; \
}
reply other threads:[~2010-04-11 4:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20100410.214024.228295222.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=James.Bottomley@suse.de \
--cc=ebiederm@xmission.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--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
all inboxes | Powered by JetHome®