From: Bart Van Assche <bvanassche@acm.org>
To: linux-scsi@vger.kernel.org
Cc: scst-devel@lists.sourceforge.net,
Greg Kroah-Hartman <gregkh@suse.de>,
Konrad Rzeszutek Wilk <konrad@darnok.org>,
Vladislav Bolkhovitin <vst@vlnb.net>,
Richard Sharpe <realrichardsharpe@gmail.com>
Subject: [PATCH 4/8] [SCSI] scst: Substitute SCST_SYSFS_BLOCK_SIZE
Date: Mon, 27 Dec 2010 14:39:06 +0100 [thread overview]
Message-ID: <201012271439.06828.bvanassche@acm.org> (raw)
In-Reply-To: <201012271435.33778.bvanassche@acm.org>
Replace all instances of SCST_SYSFS_BLOCK_SIZE by PAGE_SIZE and remove the
symbolic constant SCST_SYSFS_BLOCK_SIZE.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Vladislav Bolkhovitin <vst@vlnb.net>
---
drivers/scst/scst_sysfs.c | 54 +++++++++++++++++++-------------------------
include/scst/scst_const.h | 2 -
2 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/drivers/scst/scst_sysfs.c b/drivers/scst/scst_sysfs.c
index da325f5..ed10475 100644
--- a/drivers/scst/scst_sysfs.c
+++ b/drivers/scst/scst_sysfs.c
@@ -1531,7 +1531,7 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
processed_cmds_wr = latency_stat->processed_cmds_wr;
processed_cmds_rd = latency_stat->processed_cmds_rd;
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-5s %-9s %-15lu ", "Write", scst_io_size_names[i],
(unsigned long)processed_cmds_wr);
if (processed_cmds_wr == 0)
@@ -1543,8 +1543,7 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
(unsigned long)scst_time_wr,
(unsigned long)latency_stat->max_scst_time_wr,
(unsigned long)latency_stat->scst_time_wr);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
- "%-47s", buf);
+ res += scnprintf(&buffer[res], PAGE_SIZE - res, "%-47s", buf);
do_div(tgt_time_wr, processed_cmds_wr);
snprintf(buf, sizeof(buf), "%lu/%lu/%lu/%lu",
@@ -1552,8 +1551,7 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
(unsigned long)tgt_time_wr,
(unsigned long)latency_stat->max_tgt_time_wr,
(unsigned long)latency_stat->tgt_time_wr);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
- "%-47s", buf);
+ res += scnprintf(&buffer[res], PAGE_SIZE - res, "%-47s", buf);
do_div(dev_time_wr, processed_cmds_wr);
snprintf(buf, sizeof(buf), "%lu/%lu/%lu/%lu",
@@ -1561,10 +1559,9 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
(unsigned long)dev_time_wr,
(unsigned long)latency_stat->max_dev_time_wr,
(unsigned long)latency_stat->dev_time_wr);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
- "%-47s\n", buf);
+ res += scnprintf(&buffer[res], PAGE_SIZE - res, "%-47s\n", buf);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-5s %-9s %-15lu ", "Read", scst_io_size_names[i],
(unsigned long)processed_cmds_rd);
if (processed_cmds_rd == 0)
@@ -1576,8 +1573,7 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
(unsigned long)scst_time_rd,
(unsigned long)latency_stat->max_scst_time_rd,
(unsigned long)latency_stat->scst_time_rd);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
- "%-47s", buf);
+ res += scnprintf(&buffer[res], PAGE_SIZE - res, "%-47s", buf);
do_div(tgt_time_rd, processed_cmds_rd);
snprintf(buf, sizeof(buf), "%lu/%lu/%lu/%lu",
@@ -1585,8 +1581,7 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
(unsigned long)tgt_time_rd,
(unsigned long)latency_stat->max_tgt_time_rd,
(unsigned long)latency_stat->tgt_time_rd);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
- "%-47s", buf);
+ res += scnprintf(&buffer[res], PAGE_SIZE - res, "%-47s", buf);
do_div(dev_time_rd, processed_cmds_rd);
snprintf(buf, sizeof(buf), "%lu/%lu/%lu/%lu",
@@ -1594,8 +1589,7 @@ static ssize_t scst_tgt_dev_latency_show(struct kobject *kobj,
(unsigned long)dev_time_rd,
(unsigned long)latency_stat->max_dev_time_rd,
(unsigned long)latency_stat->dev_time_rd);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
- "%-47s\n", buf);
+ res += scnprintf(&buffer[res], PAGE_SIZE - res, "%-47s\n", buf);
}
return res;
}
@@ -1671,7 +1665,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
sess = scst_kobj_to_sess(kobj);
res = 0;
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-15s %-15s %-46s %-46s %-46s\n",
"T-L names", "Total commands", "SCST latency",
"Target latency", "Dev latency (min/avg/max/all ns)");
@@ -1695,7 +1689,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
processed_cmds_wr = latency_stat->processed_cmds_wr;
processed_cmds_rd = latency_stat->processed_cmds_rd;
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-5s %-9s %-15lu ",
"Write", scst_io_size_names[i],
(unsigned long)processed_cmds_wr);
@@ -1708,7 +1702,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)scst_time_wr,
(unsigned long)latency_stat->max_scst_time_wr,
(unsigned long)latency_stat->scst_time_wr);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s", buf);
do_div(tgt_time_wr, processed_cmds_wr);
@@ -1717,7 +1711,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)tgt_time_wr,
(unsigned long)latency_stat->max_tgt_time_wr,
(unsigned long)latency_stat->tgt_time_wr);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s", buf);
do_div(dev_time_wr, processed_cmds_wr);
@@ -1726,10 +1720,10 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)dev_time_wr,
(unsigned long)latency_stat->max_dev_time_wr,
(unsigned long)latency_stat->dev_time_wr);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s\n", buf);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-5s %-9s %-15lu ",
"Read", scst_io_size_names[i],
(unsigned long)processed_cmds_rd);
@@ -1742,7 +1736,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)scst_time_rd,
(unsigned long)latency_stat->max_scst_time_rd,
(unsigned long)latency_stat->scst_time_rd);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s", buf);
do_div(tgt_time_rd, processed_cmds_rd);
@@ -1751,7 +1745,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)tgt_time_rd,
(unsigned long)latency_stat->max_tgt_time_rd,
(unsigned long)latency_stat->tgt_time_rd);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s", buf);
do_div(dev_time_rd, processed_cmds_rd);
@@ -1760,7 +1754,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)dev_time_rd,
(unsigned long)latency_stat->max_dev_time_rd,
(unsigned long)latency_stat->dev_time_rd);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s\n", buf);
}
@@ -1769,7 +1763,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
dev_time = sess->dev_time;
processed_cmds = sess->processed_cmds;
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"\n%-15s %-16d", "Overall ", processed_cmds);
if (processed_cmds == 0)
@@ -1781,7 +1775,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)scst_time,
(unsigned long)sess->max_scst_time,
(unsigned long)sess->scst_time);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s", buf);
do_div(tgt_time, processed_cmds);
@@ -1790,7 +1784,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)tgt_time,
(unsigned long)sess->max_tgt_time,
(unsigned long)sess->tgt_time);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s", buf);
do_div(dev_time, processed_cmds);
@@ -1799,7 +1793,7 @@ static ssize_t scst_sess_latency_show(struct kobject *kobj,
(unsigned long)dev_time,
(unsigned long)sess->max_dev_time,
(unsigned long)sess->dev_time);
- res += scnprintf(&buffer[res], SCST_SYSFS_BLOCK_SIZE - res,
+ res += scnprintf(&buffer[res], PAGE_SIZE - res,
"%-47s\n\n", buf);
spin_unlock_bh(&sess->lat_lock);
@@ -1937,8 +1931,7 @@ static ssize_t scst_sess_sysfs_initiator_name_show(struct kobject *kobj,
sess = scst_kobj_to_sess(kobj);
- return scnprintf(buf, SCST_SYSFS_BLOCK_SIZE, "%s\n",
- sess->initiator_name);
+ return scnprintf(buf, PAGE_SIZE, "%s\n", sess->initiator_name);
}
static struct kobj_attribute session_initiator_name_attr =
@@ -2588,8 +2581,7 @@ out:
static ssize_t scst_acn_file_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
{
- return scnprintf(buf, SCST_SYSFS_BLOCK_SIZE, "%s\n",
- attr->attr.name);
+ return scnprintf(buf, PAGE_SIZE, "%s\n", attr->attr.name);
}
int scst_acn_sysfs_create(struct scst_acn *acn)
diff --git a/include/scst/scst_const.h b/include/scst/scst_const.h
index d1dadfa..ac446fa 100644
--- a/include/scst/scst_const.h
+++ b/include/scst/scst_const.h
@@ -379,8 +379,6 @@ enum scst_cdb_flags {
/*************************************************************
** Misc constants
*************************************************************/
-#define SCST_SYSFS_BLOCK_SIZE PAGE_SIZE
-
#define SCST_PR_DIR "/var/lib/scst/pr"
#define TID_COMMON_SIZE 24
--
1.7.1
next prev parent reply other threads:[~2010-12-27 13:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-27 13:35 [PATCH 0/8] Address recent SCST comments Bart Van Assche
2010-12-27 13:36 ` [PATCH 1/8] [SCSI] scst: Split sysfs type attribute Bart Van Assche
2010-12-27 13:37 ` [PATCH 2/8] [SCSI] scst: Split version and stats attributes Bart Van Assche
2010-12-27 13:38 ` [PATCH 3/8] [SCSI] scst: Remove [key] marker from sysfs files Bart Van Assche
2010-12-27 13:39 ` Bart Van Assche [this message]
2010-12-27 13:39 ` [PATCH 5/8] [SCSI] scst: Improve sysfs parsing robustness Bart Van Assche
2010-12-27 13:40 ` [PATCH 6/8] [SCSI] scst: Fix online documentation Bart Van Assche
2010-12-27 13:43 ` [PATCH 8/8] Make SCST sysfs documentation more complete Bart Van Assche
2010-12-27 13:46 ` [PATCH 7/8] [SCSI] scst: Correct SCST core version number Bart Van Assche
2010-12-28 17:23 ` [PATCH 0/8] Address recent SCST comments Bart Van Assche
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=201012271439.06828.bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=gregkh@suse.de \
--cc=konrad@darnok.org \
--cc=linux-scsi@vger.kernel.org \
--cc=realrichardsharpe@gmail.com \
--cc=scst-devel@lists.sourceforge.net \
--cc=vst@vlnb.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.