LU-7117 osp: set ptlrpc_request::rq_allow_replay properly

[fs/lustre-release.git] / lustre / utils / l_getidentity.c

diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c
index c4e07cd..297a831 100644 (file)
--- a/lustre/utils/l_getidentity.c
+++ b/lustre/utils/l_getidentity.c
@@ -27,13 +27,14 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -48,7 +49,8 @@
 #include <libgen.h>
 #include <syslog.h>
 
-#include <libcfs/libcfs.h>
+#include <libcfs/util/param.h>
+#include <libcfs/util/string.h>
 #include <lnet/nidstr.h>
 #include <lustre/lustre_user.h>
 #include <lustre/lustre_idl.h>
@@ -64,7 +66,7 @@
  * the valid values for perms are:
  * setuid/setgid/setgrp/rmtacl           -- enable corresponding perm
  * nosetuid/nosetgid/nosetgrp/normtacl   -- disable corresponding perm
- * they can be listed together, seperated by ',',
+ * they can be listed together, separated by ',',
  * when perm and noperm are in the same line (item), noperm is preferential,
  * when they are in different lines (items), the latter is preferential,
  * '*' nid is as default perm, and is not preferential.
@@ -74,11 +76,11 @@ static char *progname;
 
 static void usage(void)
 {
-        fprintf(stderr,
-                "\nusage: %s {mdtname} {uid}\n"
-                "Normally invoked as an upcall from Lustre, set via:\n"
-                "/proc/fs/lustre/mdt/${mdtname}/identity_upcall\n",
-                progname);
+       fprintf(stderr,
+               "\nusage: %s {mdtname} {uid}\n"
+               "Normally invoked as an upcall from Lustre, set via:\n"
+               "lctl set_param mdt.${mdtname}.identity_upcall={path to upcall}\n",
+               progname);
 }
 
 static int compare_u32(const void *v1, const void *v2)
@@ -201,8 +203,6 @@ static perm_type_t perm_types[] = {
         { "setuid", CFS_SETUID_PERM },
         { "setgid", CFS_SETGID_PERM },
         { "setgrp", CFS_SETGRP_PERM },
-        { "rmtacl", CFS_RMTACL_PERM },
-        { "rmtown", CFS_RMTOWN_PERM },
         { 0 }
 };
 
@@ -210,8 +210,6 @@ static perm_type_t noperm_types[] = {
         { "nosetuid", CFS_SETUID_PERM },
         { "nosetgid", CFS_SETGID_PERM },
         { "nosetgrp", CFS_SETGRP_PERM },
-        { "normtacl", CFS_RMTACL_PERM },
-        { "normtown", CFS_RMTOWN_PERM },
         { 0 }
 };
 
@@ -411,18 +409,19 @@ static void show_result(struct identity_downcall_data *data)
 
                 pdd = &data->idd_perms[i];
 
-                printf("  "LPX64"\t0x%x\n", pdd->pdd_nid, pdd->pdd_perm);
+               printf("  %#jx\t0x%x\n", (uintmax_t)pdd->pdd_nid,
+                      pdd->pdd_perm);
         }
         printf("\n");
 }
 
 int main(int argc, char **argv)
 {
-        char *end;
-        struct identity_downcall_data *data = NULL;
-        char procname[1024];
-        unsigned long uid;
-        int fd, rc = -EINVAL, size, maxgroups;
+       char *end;
+       struct identity_downcall_data *data = NULL;
+       glob_t path;
+       unsigned long uid;
+       int fd, rc = -EINVAL, size, maxgroups;
 
         progname = basename(argv[0]);
         if (argc != 3) {
@@ -472,26 +471,33 @@ downcall:
                 goto out;
         }
 
-        snprintf(procname, sizeof(procname),
-                 "/proc/fs/lustre/mdt/%s/identity_info", argv[1]);
-        fd = open(procname, O_WRONLY);
-        if (fd < 0) {
-                errlog("can't open file %s: %s\n", procname, strerror(errno));
-                rc = -1;
-                goto out;
-        }
+       rc = cfs_get_param_paths(&path, "mdt/%s/identity_info", argv[1]);
+       if (rc != 0) {
+               rc = -errno;
+               goto out;
+       }
 
-        rc = write(fd, data, size);
-        close(fd);
-        if (rc != size) {
-                errlog("partial write ret %d: %s\n", rc, strerror(errno));
-                rc = -1;
-        } else {
-                rc = 0;
-        }
+       fd = open(path.gl_pathv[0], O_WRONLY);
+       if (fd < 0) {
+               errlog("can't open file '%s':%s\n", path.gl_pathv[0],
+                      strerror(errno));
+               rc = -errno;
+               goto out_params;
+       }
+
+       rc = write(fd, data, size);
+       close(fd);
+       if (rc != size) {
+               errlog("partial write ret %d: %s\n", rc, strerror(errno));
+               rc = -1;
+       } else {
+               rc = 0;
+       }
 
+out_params:
+       cfs_free_param_data(&path);
 out:
-        if (data != NULL)
-                free(data);
-        return rc;
+       if (data != NULL)
+               free(data);
+       return rc;
 }