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-592 1.8 <-> 2.1 interop: missing LMV on client
[fs/lustre-release.git]
/
lustre
/
lmv
/
lproc_lmv.c
diff --git
a/lustre/lmv/lproc_lmv.c
b/lustre/lmv/lproc_lmv.c
index
e880d23
..
030601b
100644
(file)
--- a/
lustre/lmv/lproc_lmv.c
+++ b/
lustre/lmv/lproc_lmv.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-90,7
+90,7
@@
static int lmv_rd_placement(char *page, char **start, off_t off, int count,
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
*eof = 1;
LASSERT(dev != NULL);
lmv = &dev->u.lmv;
*eof = 1;
- return snprintf(page, count, "%s\n",
+ return snprintf(page, count, "%s\n",
placement_policy2name(lmv->lmv_placement));
}
placement_policy2name(lmv->lmv_placement));
}
@@
-106,7
+106,7
@@
static int lmv_wr_placement(struct file *file, const char *buffer,
placement_policy_t policy;
struct lmv_obd *lmv;
placement_policy_t policy;
struct lmv_obd *lmv;
- if (copy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE))
+ if (c
fs_c
opy_from_user(dummy, buffer, MAX_POLICY_STRING_SIZE))
return -EFAULT;
LASSERT(dev != NULL);
return -EFAULT;
LASSERT(dev != NULL);
@@
-121,9
+121,9
@@
static int lmv_wr_placement(struct file *file, const char *buffer,
policy = placement_name2policy(dummy, len);
if (policy != PLACEMENT_INVAL_POLICY) {
policy = placement_name2policy(dummy, len);
if (policy != PLACEMENT_INVAL_POLICY) {
- spin_lock(&lmv->lmv_lock);
+
cfs_
spin_lock(&lmv->lmv_lock);
lmv->lmv_placement = policy;
lmv->lmv_placement = policy;
- spin_unlock(&lmv->lmv_lock);
+
cfs_
spin_unlock(&lmv->lmv_lock);
} else {
CERROR("Invalid placement policy \"%s\"!\n", dummy);
return -EINVAL;
} else {
CERROR("Invalid placement policy \"%s\"!\n", dummy);
return -EINVAL;
@@
-182,7
+182,7
@@
static int lmv_tgt_seq_show(struct seq_file *p, void *v)
struct obd_device *dev = p->private;
struct lmv_obd *lmv = &dev->u.lmv;
int idx = tgt - &(lmv->tgts[0]);
struct obd_device *dev = p->private;
struct lmv_obd *lmv = &dev->u.lmv;
int idx = tgt - &(lmv->tgts[0]);
-
+
return seq_printf(p, "%d: %s %sACTIVE\n", idx, tgt->ltd_uuid.uuid,
tgt->ltd_active ? "" : "IN");
}
return seq_printf(p, "%d: %s %sACTIVE\n", idx, tgt->ltd_uuid.uuid,
tgt->ltd_active ? "" : "IN");
}
@@
-199,7
+199,7
@@
static int lmv_target_seq_open(struct inode *inode, struct file *file)
struct proc_dir_entry *dp = PDE(inode);
struct seq_file *seq;
int rc;
struct proc_dir_entry *dp = PDE(inode);
struct seq_file *seq;
int rc;
-
+
rc = seq_open(file, &lmv_tgt_sops);
if (rc)
return rc;
rc = seq_open(file, &lmv_tgt_sops);
if (rc)
return rc;