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=14230
[fs/lustre-release.git]
/
lustre
/
mdt
/
mdt_lproc.c
diff --git
a/lustre/mdt/mdt_lproc.c
b/lustre/mdt/mdt_lproc.c
index
ed46c91
..
ec7034e
100644
(file)
--- a/
lustre/mdt/mdt_lproc.c
+++ b/
lustre/mdt/mdt_lproc.c
@@
-155,10
+155,14
@@
static int lprocfs_rd_identity_upcall(char *page, char **start, off_t off,
{
struct obd_device *obd = data;
struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
+ struct upcall_cache *hash = mdt->mdt_identity_cache;
+ int len;
*eof = 1;
- return snprintf(page, count, "%s\n",
- mdt->mdt_identity_cache->uc_upcall);
+ read_lock(&hash->uc_upcall_rwlock);
+ len = snprintf(page, count, "%s\n", hash->uc_upcall);
+ read_unlock(&hash->uc_upcall_rwlock);
+ return len;
}
static int lprocfs_wr_identity_upcall(struct file *file, const char *buffer,
@@
-179,13
+183,19
@@
static int lprocfs_wr_identity_upcall(struct file *file, const char *buffer,
return -EFAULT;
/* Remove any extraneous bits from the upcall (e.g. linefeeds) */
+ write_lock(&hash->uc_upcall_rwlock);
sscanf(kernbuf, "%s", hash->uc_upcall);
+ write_unlock(&hash->uc_upcall_rwlock);
if (strcmp(hash->uc_name, obd->obd_name) != 0)
CWARN("%s: write to upcall name %s\n",
obd->obd_name, hash->uc_upcall);
- CWARN("%s: identity upcall set to %s\n", obd->obd_name, hash->uc_upcall);
+ if (strcmp(hash->uc_upcall, "NONE") == 0 && mdt->mdt_opts.mo_acl)
+ CWARN("%s: disable \"identity_upcall\" with ACL enabled maybe "
+ "cause unexpected \"EACCESS\"\n", obd->obd_name);
+
+ CWARN("%s: identity upcall set to %s\n", obd->obd_name, hash->uc_upcall);
return count;
}
@@
-227,9
+237,9
@@
static int lprocfs_wr_identity_info(struct file *file, const char *buffer,
GOTO(out, rc = -EINVAL);
}
- if (sparam.idd_nperms > N_
SETXID_
PERMS_MAX) {
+ if (sparam.idd_nperms > N_PERMS_MAX) {
CERROR("%s: perm count %d more than maximum %d\n",
- obd->obd_name, sparam.idd_nperms, N_
SETXID_
PERMS_MAX);
+ obd->obd_name, sparam.idd_nperms, N_PERMS_MAX);
GOTO(out, rc = -EINVAL);
}
@@
-268,301
+278,6
@@
out:
return rc ?: count;
}
-static int lprocfs_rd_rmtacl_expire(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
-
- *eof = 1;
- return snprintf(page, count, "%lu\n",
- mdt->mdt_rmtacl_cache->uc_entry_expire / HZ);
-}
-
-static int lprocfs_wr_rmtacl_expire(struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- int rc, val;
-
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc)
- return rc;
-
- mdt->mdt_rmtacl_cache->uc_entry_expire = val * HZ;
- return count;
-}
-
-static int lprocfs_rd_rmtacl_acquire_expire(char *page, char **start,
- off_t off, int count, int *eof,
- void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
-
- *eof = 1;
- return snprintf(page, count, "%lu\n",
- mdt->mdt_rmtacl_cache->uc_acquire_expire / HZ);
-}
-
-static int lprocfs_wr_rmtacl_acquire_expire(struct file *file,
- const char *buffer,
- unsigned long count,
- void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- int rc, val;
-
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc)
- return rc;
-
- mdt->mdt_rmtacl_cache->uc_acquire_expire = val * HZ;
- return count;
-}
-
-static int lprocfs_rd_rmtacl_upcall(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
-
- *eof = 1;
- return snprintf(page, count, "%s\n",
- mdt->mdt_rmtacl_cache->uc_upcall);
-}
-
-static int lprocfs_wr_rmtacl_upcall(struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- struct upcall_cache *hash = mdt->mdt_rmtacl_cache;
- char kernbuf[UC_CACHE_UPCALL_MAXPATH] = { '\0' };
-
- if (count >= UC_CACHE_UPCALL_MAXPATH) {
- CERROR("%s: remote ACL upcall too long\n", obd->obd_name);
- return -EINVAL;
- }
-
- if (copy_from_user(kernbuf, buffer,
- min(count, UC_CACHE_UPCALL_MAXPATH - 1)))
- return -EFAULT;
-
- /* Remove any extraneous bits from the upcall (e.g. linefeeds) */
- sscanf(kernbuf, "%s", hash->uc_upcall);
-
- if (strcmp(hash->uc_name, obd->obd_name) != 0)
- CWARN("%s: write to upcall name %s\n",
- obd->obd_name, hash->uc_upcall);
- CWARN("%s: remote ACL upcall set to %s\n", obd->obd_name, hash->uc_upcall);
-
- return count;
-}
-
-static int lprocfs_wr_rmtacl_info(struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- struct rmtacl_downcall_data sparam, *param = &sparam;
- int size = 0, rc = 0;
-
- if (count < sizeof(*param)) {
- CERROR("%s: invalid data size %lu\n", obd->obd_name, count);
- return count;
- }
-
- if (copy_from_user(&sparam, buffer, sizeof(sparam))) {
- CERROR("%s: bad remote acl data\n", obd->obd_name);
- GOTO(out, rc = -EFAULT);
- }
-
- if (sparam.add_magic != RMTACL_DOWNCALL_MAGIC) {
- CERROR("%s: MDT remote acl downcall bad params\n", obd->obd_name);
- GOTO(out, rc = -EINVAL);
- }
-
- if (sparam.add_buflen) {
- size = offsetof(struct rmtacl_downcall_data,
- add_buf[sparam.add_buflen]);
- OBD_ALLOC(param, size);
- if (!param) {
- CERROR("%s: fail to alloc %d bytes for ino "LPU64"\n",
- obd->obd_name, size, sparam.add_key);
- param = &sparam;
- param->add_buflen = 0;
- } else if (copy_from_user(param, buffer, size)) {
- CERROR("%s: ino "LPU64" bad remote acl data\n",
- obd->obd_name, sparam.add_key);
- OBD_FREE(param, size);
- param = &sparam;
- param->add_buflen = 0;
- }
- }
-
- rc = upcall_cache_downcall(mdt->mdt_rmtacl_cache, 0, param->add_key,
- param);
-
-out:
- if (param && (param != &sparam))
- OBD_FREE(param, size);
-
- return rc ?: count;
-}
-
-static int lprocfs_rd_rootsquash_uid(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- struct rootsquash_info *rsi = mdt->mdt_rootsquash_info;
-
- *eof = 1;
- return snprintf(page, count, "%u\n",
- rsi ? rsi->rsi_uid : 0);
-}
-
-static int lprocfs_wr_rootsquash_uid(struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- int val, rc;
-
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc)
- return rc;
-
- if (!mdt->mdt_rootsquash_info)
- OBD_ALLOC_PTR(mdt->mdt_rootsquash_info);
- if (!mdt->mdt_rootsquash_info)
- return -ENOMEM;
-
- mdt->mdt_rootsquash_info->rsi_uid = val;
- return count;
-}
-
-static int lprocfs_rd_rootsquash_gid(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- struct rootsquash_info *rsi = mdt->mdt_rootsquash_info;
-
- *eof = 1;
- return snprintf(page, count, "%u\n",
- rsi ? rsi->rsi_gid : 0);
-}
-
-static int lprocfs_wr_rootsquash_gid(struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- int val, rc;
-
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc)
- return rc;
-
- if (!mdt->mdt_rootsquash_info)
- OBD_ALLOC_PTR(mdt->mdt_rootsquash_info);
- if (!mdt->mdt_rootsquash_info)
- return -ENOMEM;
-
- mdt->mdt_rootsquash_info->rsi_gid = val;
- return count;
-}
-
-static int lprocfs_rd_nosquash_nids(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- struct rootsquash_info *rsi = mdt->mdt_rootsquash_info;
- int i, ret;
-
- ret = snprintf(page, count, "rootsquash skip list:\n");
- for (i = 0; rsi && (i < rsi->rsi_n_nosquash_nids); i++) {
- ret += snprintf(page + ret, count - ret, "%s\n",
- libcfs_nid2str(rsi->rsi_nosquash_nids[i]));
- }
-
- *eof = 1;
- return ret;
-}
-
-static inline void remove_newline(char *str)
-{
- int len = strlen(str);
-
- if (str[len - 1] == '\n')
- str[len - 1] = '\0';
-}
-
-/* XXX: This macro is copied from lnet/libcfs/nidstring.c */
-#define LNET_NIDSTR_SIZE 32 /* size of each one (see below for usage) */
-
-static void do_process_nosquash_nids(struct mdt_device *m, char *buf)
-{
- struct rootsquash_info *rsi = m->mdt_rootsquash_info;
- char str[LNET_NIDSTR_SIZE], *end;
- lnet_nid_t nid;
-
- LASSERT(rsi);
- rsi->rsi_n_nosquash_nids = 0;
- while (rsi->rsi_n_nosquash_nids < N_NOSQUASH_NIDS) {
- end = strchr(buf, ',');
- memset(str, 0, sizeof(str));
- if (end)
- strncpy(str, buf, min_t(int, sizeof(str), end - buf));
- else
- strncpy(str, buf, min_t(int, sizeof(str), strlen(buf)));
-
- if (!strcmp(str, "*")) {
- nid = LNET_NID_ANY;
- } else {
- nid = libcfs_str2nid(str);
- if (nid == LNET_NID_ANY)
- goto ignore;
- }
- rsi->rsi_nosquash_nids[rsi->rsi_n_nosquash_nids++] = nid;
-ignore:
- if (!end || (*(end + 1) == 0))
- return;
- buf = end + 1;
- }
-}
-
-static int lprocfs_wr_nosquash_nids(struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = data;
- struct mdt_device *mdt = mdt_dev(obd->obd_lu_dev);
- char skips[LNET_NIDSTR_SIZE * N_NOSQUASH_NIDS] = "";
- unsigned long size = sizeof(skips);
-
- if (count > size) {
- CERROR("parameter exceeds max limit %lu\n", size);
- return -EINVAL;
- }
-
- if (copy_from_user(skips, buffer, min(size, count)))
- return -EFAULT;
-
- if (!mdt->mdt_rootsquash_info)
- OBD_ALLOC_PTR(mdt->mdt_rootsquash_info);
- if (!mdt->mdt_rootsquash_info)
- return -ENOMEM;
-
- remove_newline(skips);
- do_process_nosquash_nids(mdt, skips);
- return count;
-}
-
/* for debug only */
static int lprocfs_rd_capa(char *page, char **start, off_t off,
int count, int *eof, void *data)
@@
-728,19
+443,6
@@
static struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
lprocfs_wr_identity_upcall, 0 },
{ "identity_flush", 0, lprocfs_wr_identity_flush, 0 },
{ "identity_info", 0, lprocfs_wr_identity_info, 0 },
- { "rmtacl_expire", lprocfs_rd_rmtacl_expire,
- lprocfs_wr_rmtacl_expire, 0 },
- { "rmtacl_acquire_expire", lprocfs_rd_rmtacl_acquire_expire,
- lprocfs_wr_rmtacl_acquire_expire, 0 },
- { "rmtacl_upcall", lprocfs_rd_rmtacl_upcall,
- lprocfs_wr_rmtacl_upcall, 0 },
- { "rmtacl_info", 0, lprocfs_wr_rmtacl_info, 0 },
- { "rootsquash_uid", lprocfs_rd_rootsquash_uid,
- lprocfs_wr_rootsquash_uid, 0 },
- { "rootsquash_gid", lprocfs_rd_rootsquash_gid,
- lprocfs_wr_rootsquash_gid, 0 },
- { "nosquash_nids", lprocfs_rd_nosquash_nids,
- lprocfs_wr_nosquash_nids, 0 },
{ "capa", lprocfs_rd_capa,
lprocfs_wr_capa, 0 },
{ "capa_timeout", lprocfs_rd_capa_timeout,
@@
-758,4
+460,8
@@
static struct lprocfs_vars lprocfs_mdt_module_vars[] = {
{ 0 }
};
-LPROCFS_INIT_VARS(mdt, lprocfs_mdt_module_vars, lprocfs_mdt_obd_vars);
+void lprocfs_mdt_init_vars(struct lprocfs_static_vars *lvars)
+{
+ lvars->module_vars = lprocfs_mdt_module_vars;
+ lvars->obd_vars = lprocfs_mdt_obd_vars;
+}