Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8592 mdt: hold mdt_device::mdt_md_root until service stop
[fs/lustre-release.git]
/
lustre
/
fid
/
lproc_fid.c
diff --git
a/lustre/fid/lproc_fid.c
b/lustre/fid/lproc_fid.c
index
078df00
..
6f3be62
100644
(file)
--- a/
lustre/fid/lproc_fid.c
+++ b/
lustre/fid/lproc_fid.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-127,17
+123,15
@@
static int
lprocfs_server_fid_space_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
lprocfs_server_fid_space_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
- rc = seq_printf(m, "["LPX64" - "LPX64"]:%x:%s\n",
- PRANGE(&seq->lss_space));
+ seq_printf(m, "[%#llx - %#llx]:%x:%s\n", PRANGE(&seq->lss_space));
mutex_unlock(&seq->lss_mutex);
mutex_unlock(&seq->lss_mutex);
- RETURN(
rc
);
+ RETURN(
0
);
}
static int
}
static int
@@
-145,7
+139,6
@@
lprocfs_server_fid_server_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
struct client_obd *cli;
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
struct client_obd *cli;
- int rc;
ENTRY;
LASSERT(seq != NULL);
ENTRY;
LASSERT(seq != NULL);
@@
-153,16
+146,15
@@
lprocfs_server_fid_server_seq_show(struct seq_file *m, void *unused)
if (seq->lss_cli) {
if (seq->lss_cli->lcs_exp != NULL) {
cli = &seq->lss_cli->lcs_exp->exp_obd->u.cli;
if (seq->lss_cli) {
if (seq->lss_cli->lcs_exp != NULL) {
cli = &seq->lss_cli->lcs_exp->exp_obd->u.cli;
-
rc =
seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
+ seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
} else {
} else {
- rc = seq_printf(m, "%s\n",
- seq->lss_cli->lcs_srv->lss_name);
+ seq_printf(m, "%s\n", seq->lss_cli->lcs_srv->lss_name);
}
} else {
}
} else {
-
rc = seq_printf
(m, "<none>\n");
+
seq_puts
(m, "<none>\n");
}
}
- RETURN(
rc
);
+ RETURN(
0
);
}
static ssize_t
}
static ssize_t
@@
-170,22
+162,30
@@
lprocfs_server_fid_width_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_server_seq *seq = ((struct seq_file *)file->private_data)->private;
size_t count, loff_t *off)
{
struct lu_server_seq *seq = ((struct seq_file *)file->private_data)->private;
- int rc, val;
+ int rc;
+ __s64 val;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc != 0) {
- CERROR("%s: invalid width.\n", seq->lss_name);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
+ if (rc) {
+ CERROR("%s: invalid FID sequence width: rc = %d\n",
+ seq->lss_name, rc);
GOTO(out_unlock, count = rc);
}
GOTO(out_unlock, count = rc);
}
+ if (val < 0) {
+ CERROR("%s: invalid FID sequence width: rc = %d\n",
+ seq->lss_name, -ERANGE);
+ GOTO(out_unlock, count = -ERANGE);
+ }
+
seq->lss_width = val;
seq->lss_width = val;
- CDEBUG(D_INFO, "%s: Width:
"LPU64"
\n",
+ CDEBUG(D_INFO, "%s: Width:
%llu
\n",
seq->lss_name, seq->lss_width);
out_unlock:
mutex_unlock(&seq->lss_mutex);
seq->lss_name, seq->lss_width);
out_unlock:
mutex_unlock(&seq->lss_mutex);
@@
-197,16
+197,15
@@
static int
lprocfs_server_fid_width_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
lprocfs_server_fid_width_seq_show(struct seq_file *m, void *unused)
{
struct lu_server_seq *seq = (struct lu_server_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lss_mutex);
-
rc = seq_printf(m, LPU64"
\n", seq->lss_width);
+
seq_printf(m, "%llu
\n", seq->lss_width);
mutex_unlock(&seq->lss_mutex);
mutex_unlock(&seq->lss_mutex);
- RETURN(
rc
);
+ RETURN(
0
);
}
LPROC_SEQ_FOPS(lprocfs_server_fid_space);
}
LPROC_SEQ_FOPS(lprocfs_server_fid_space);
@@
-334,7
+333,7
@@
static int fldb_seq_show(struct seq_file *p, void *v)
fld->lsf_name, rc);
} else if (fld_rec.lsr_start != 0) {
range_be_to_cpu(&fld_rec, &fld_rec);
fld->lsf_name, rc);
} else if (fld_rec.lsr_start != 0) {
range_be_to_cpu(&fld_rec, &fld_rec);
-
rc =
seq_printf(p, DRANGE"\n", PRANGE(&fld_rec));
+ seq_printf(p, DRANGE"\n", PRANGE(&fld_rec));
}
return rc;
}
return rc;
@@
-533,17
+532,16
@@
static int
lprocfs_client_fid_space_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
lprocfs_client_fid_space_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
-
rc = seq_printf(m, "["LPX64" - "LPX64"
]:%x:%s\n",
-
PRANGE(&seq->lcs_space));
+
seq_printf(m, "[%#llx - %#llx
]:%x:%s\n",
+ PRANGE(&seq->lcs_space));
mutex_unlock(&seq->lcs_mutex);
mutex_unlock(&seq->lcs_mutex);
- RETURN(
rc
);
+ RETURN(
0
);
}
static ssize_t
}
static ssize_t
@@
-551,18
+549,18
@@
lprocfs_client_fid_width_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private;
size_t count, loff_t *off)
{
struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private;
- __u64 max;
- int rc, val;
+ __u64 max;
+ int rc;
+ __s64 val;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
- rc = lprocfs_
write_helper
(buffer, count, &val);
+ rc = lprocfs_
str_to_s64
(buffer, count, &val);
if (rc) {
if (rc) {
- mutex_unlock(&seq->lcs_mutex);
- RETURN(rc);
+ GOTO(out_unlock, count = rc);
}
if (seq->lcs_type == LUSTRE_SEQ_DATA)
}
if (seq->lcs_type == LUSTRE_SEQ_DATA)
@@
-573,11
+571,14
@@
lprocfs_client_fid_width_seq_write(struct file *file, const char __user *buffer,
if (val <= max && val > 0) {
seq->lcs_width = val;
if (val <= max && val > 0) {
seq->lcs_width = val;
- CDEBUG(D_INFO, "%s: Sequence size:
"LPU64"
\n",
+ CDEBUG(D_INFO, "%s: Sequence size:
%llu
\n",
seq->lcs_name, seq->lcs_width);
seq->lcs_name, seq->lcs_width);
+ } else {
+ GOTO(out_unlock, count = -ERANGE);
}
}
- mutex_unlock(&seq->lcs_mutex);
+out_unlock:
+ mutex_unlock(&seq->lcs_mutex);
RETURN(count);
}
RETURN(count);
}
@@
-585,32
+586,30
@@
static int
lprocfs_client_fid_width_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
lprocfs_client_fid_width_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
-
rc = seq_printf(m, LPU64"
\n", seq->lcs_width);
+
seq_printf(m, "%llu
\n", seq->lcs_width);
mutex_unlock(&seq->lcs_mutex);
mutex_unlock(&seq->lcs_mutex);
- RETURN(
rc
);
+ RETURN(
0
);
}
static int
lprocfs_client_fid_fid_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
}
static int
lprocfs_client_fid_fid_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
- int rc;
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
ENTRY;
LASSERT(seq != NULL);
mutex_lock(&seq->lcs_mutex);
-
rc =
seq_printf(m, DFID"\n", PFID(&seq->lcs_fid));
+ seq_printf(m, DFID"\n", PFID(&seq->lcs_fid));
mutex_unlock(&seq->lcs_mutex);
mutex_unlock(&seq->lcs_mutex);
- RETURN(
rc
);
+ RETURN(
0
);
}
static int
}
static int
@@
-618,18
+617,17
@@
lprocfs_client_fid_server_seq_show(struct seq_file *m, void *unused)
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
struct client_obd *cli;
{
struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
struct client_obd *cli;
- int rc;
ENTRY;
LASSERT(seq != NULL);
if (seq->lcs_exp != NULL) {
cli = &seq->lcs_exp->exp_obd->u.cli;
ENTRY;
LASSERT(seq != NULL);
if (seq->lcs_exp != NULL) {
cli = &seq->lcs_exp->exp_obd->u.cli;
-
rc =
seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
+ seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
} else {
} else {
-
rc =
seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
+ seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
}
}
- RETURN(
rc
);
+ RETURN(
0
);
}
LPROC_SEQ_FOPS(lprocfs_client_fid_space);
}
LPROC_SEQ_FOPS(lprocfs_client_fid_space);