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
b=17167 libcfs: ensure all libcfs exported symbols to have cfs_ prefix
[fs/lustre-release.git]
/
lustre
/
obdclass
/
linux
/
linux-module.c
diff --git
a/lustre/obdclass/linux/linux-module.c
b/lustre/obdclass/linux/linux-module.c
index
c043218
..
3480e20
100644
(file)
--- a/
lustre/obdclass/linux/linux-module.c
+++ b/
lustre/obdclass/linux/linux-module.c
@@
-16,8
+16,8
@@
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
[sun.com URL with a
- *
copy of GPLv2].
+ * 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
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
@@
-98,7
+98,7
@@
int obd_ioctl_getdata(char **buf, int *len, void *arg)
int offset = 0;
ENTRY;
int offset = 0;
ENTRY;
- err = copy_from_user(&hdr, (void *)arg, sizeof(hdr));
+ err = c
fs_c
opy_from_user(&hdr, (void *)arg, sizeof(hdr));
if ( err )
RETURN(err);
if ( err )
RETURN(err);
@@
-130,7
+130,7
@@
int obd_ioctl_getdata(char **buf, int *len, void *arg)
*len = hdr.ioc_len;
data = (struct obd_ioctl_data *)*buf;
*len = hdr.ioc_len;
data = (struct obd_ioctl_data *)*buf;
- err = copy_from_user(*buf, (void *)arg, hdr.ioc_len);
+ err = c
fs_c
opy_from_user(*buf, (void *)arg, hdr.ioc_len);
if ( err ) {
OBD_VFREE(*buf, hdr.ioc_len);
RETURN(err);
if ( err ) {
OBD_VFREE(*buf, hdr.ioc_len);
RETURN(err);
@@
-144,17
+144,17
@@
int obd_ioctl_getdata(char **buf, int *len, void *arg)
if (data->ioc_inllen1) {
data->ioc_inlbuf1 = &data->ioc_bulk[0];
if (data->ioc_inllen1) {
data->ioc_inlbuf1 = &data->ioc_bulk[0];
- offset += size_round(data->ioc_inllen1);
+ offset +=
cfs_
size_round(data->ioc_inllen1);
}
if (data->ioc_inllen2) {
data->ioc_inlbuf2 = &data->ioc_bulk[0] + offset;
}
if (data->ioc_inllen2) {
data->ioc_inlbuf2 = &data->ioc_bulk[0] + offset;
- offset += size_round(data->ioc_inllen2);
+ offset +=
cfs_
size_round(data->ioc_inllen2);
}
if (data->ioc_inllen3) {
data->ioc_inlbuf3 = &data->ioc_bulk[0] + offset;
}
if (data->ioc_inllen3) {
data->ioc_inlbuf3 = &data->ioc_bulk[0] + offset;
- offset += size_round(data->ioc_inllen3);
+ offset +=
cfs_
size_round(data->ioc_inllen3);
}
if (data->ioc_inllen4) {
}
if (data->ioc_inllen4) {
@@
-169,7
+169,7
@@
int obd_ioctl_popdata(void *arg, void *data, int len)
{
int err;
{
int err;
- err = copy_to_user(arg, data, len);
+ err = c
fs_c
opy_to_user(arg, data, len);
if (err)
err = -EFAULT;
return err;
if (err)
err = -EFAULT;
return err;
@@
-204,7
+204,8
@@
static int obd_class_ioctl(struct inode *inode, struct file *filp,
int err = 0;
ENTRY;
int err = 0;
ENTRY;
- if (current->fsuid != 0)
+ /* Allow non-root access for OBD_IOC_PING_TARGET - used by lfs check */
+ if (!cfs_capable(CFS_CAP_SYS_ADMIN) && (cmd != OBD_IOC_PING_TARGET))
RETURN(err = -EACCES);
if ((cmd & 0xffffff00) == ((int)'T') << 8) /* ignore all tty ioctls */
RETURN(err = -ENOTTY);
RETURN(err = -EACCES);
if ((cmd & 0xffffff00) == ((int)'T') << 8) /* ignore all tty ioctls */
RETURN(err = -ENOTTY);
@@
-245,7
+246,8
@@
int obd_proc_read_version(char *page, char **start, off_t off, int count,
BUILD_VERSION);
#else
return snprintf(page, count, "lustre: %s\nkernel: %s\nbuild: %s\n",
BUILD_VERSION);
#else
return snprintf(page, count, "lustre: %s\nkernel: %s\nbuild: %s\n",
- LUSTRE_VERSION_STRING, "patchless", BUILD_VERSION);
+ LUSTRE_VERSION_STRING, "patchless_client",
+ BUILD_VERSION);
#endif
}
#endif
}
@@
-286,7
+288,7
@@
static int obd_proc_read_health(char *page, char **start, off_t off,
if (libcfs_catastrophe)
rc += snprintf(page + rc, count - rc, "LBUG\n");
if (libcfs_catastrophe)
rc += snprintf(page + rc, count - rc, "LBUG\n");
- spin_lock(&obd_dev_lock);
+
cfs_
spin_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd;
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd;
@@
-298,18
+300,18
@@
static int obd_proc_read_health(char *page, char **start, off_t off,
if (obd->obd_stopping)
continue;
if (obd->obd_stopping)
continue;
- class_incref(obd);
- spin_unlock(&obd_dev_lock);
+ class_incref(obd
, __FUNCTION__, cfs_current()
);
+
cfs_
spin_unlock(&obd_dev_lock);
if (obd_health_check(obd)) {
rc += snprintf(page + rc, count - rc,
"device %s reported unhealthy\n",
obd->obd_name);
}
if (obd_health_check(obd)) {
rc += snprintf(page + rc, count - rc,
"device %s reported unhealthy\n",
obd->obd_name);
}
- class_decref(obd);
- spin_lock(&obd_dev_lock);
+ class_decref(obd
, __FUNCTION__, cfs_current()
);
+
cfs_
spin_lock(&obd_dev_lock);
}
}
- spin_unlock(&obd_dev_lock);
+
cfs_
spin_unlock(&obd_dev_lock);
if (rc == 0)
return snprintf(page, count, "healthy\n");
if (rc == 0)
return snprintf(page, count, "healthy\n");
@@
-345,7
+347,7
@@
static void obd_device_list_seq_stop(struct seq_file *p, void *v)
}
static void *obd_device_list_seq_next(struct seq_file *p, void *v, loff_t *pos)
}
static void *obd_device_list_seq_next(struct seq_file *p, void *v, loff_t *pos)
-{
+{
++*pos;
if (*pos >= class_devno_max())
return NULL;
++*pos;
if (*pos >= class_devno_max())
return NULL;
@@
-377,7
+379,7
@@
static int obd_device_list_seq_show(struct seq_file *p, void *v)
return seq_printf(p, "%3d %s %s %s %s %d\n",
(int)index, status, obd->obd_type->typ_name,
obd->obd_name, obd->obd_uuid.uuid,
return seq_printf(p, "%3d %s %s %s %s %d\n",
(int)index, status, obd->obd_type->typ_name,
obd->obd_name, obd->obd_uuid.uuid,
- atomic_read(&obd->obd_refcount));
+
cfs_
atomic_read(&obd->obd_refcount));
}
struct seq_operations obd_device_list_sops = {
}
struct seq_operations obd_device_list_sops = {
@@
-418,7
+420,7
@@
int class_procfs_init(void)
ENTRY;
obd_sysctl_init();
ENTRY;
obd_sysctl_init();
- proc_lustre_root = lprocfs_register("
lustre", proc_root_fs
,
+ proc_lustre_root = lprocfs_register("
fs/lustre", NULL
,
lprocfs_base, NULL);
rc = lprocfs_seq_create(proc_lustre_root, "devices", 0444,
&obd_device_list_fops, NULL);
lprocfs_base, NULL);
rc = lprocfs_seq_create(proc_lustre_root, "devices", 0444,
&obd_device_list_fops, NULL);