some minor changes in lsd upcall.

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

diff --git a/lustre/utils/lsd_upcall.c b/lustre/utils/lsd_upcall.c
index 2b110d8..9e1f640 100644 (file)
--- a/lustre/utils/lsd_upcall.c
+++ b/lustre/utils/lsd_upcall.c
@@ -282,6 +282,16 @@ int parse_perm(__u32 *perm, char *str)
         return 0;
 }
 
+int parse_nid(ptl_nid_t *nidp, char *nid_str)
+{
+        if (!strcmp(nid_str, "*")) {
+                *nidp = PTL_NID_ANY;
+                return 0;
+        }
+
+        return ptl_parse_nid(nidp, nid_str);
+}
+
 int get_one_perm(FILE *fp, struct lsd_permission *perm)
 {
         char nid_str[256], perm_str[256];
@@ -298,7 +308,7 @@ again:
         if (rc != 2)
                 return -1;
 
-        if (ptl_parse_nid(&perm->nid, nid_str))
+        if (parse_nid(&perm->nid, nid_str))
                 return -1;
 
         if (parse_perm(&perm->perm, perm_str))
@@ -377,14 +387,16 @@ int main (int argc, char **argv)
 
         /* read user/group database */
         ioc_data.err = get_groups_local(ioc_data.uid, &ioc_data.gid,
-                                        &ioc_data.ngroups, &ioc_data.groups);
+                                        (int *)&ioc_data.ngroups,
+                                        &ioc_data.groups);
         if (ioc_data.err)
                 goto do_downcall;
 
         /* read lsd config database */
         conf_fp = fopen(conf_name, "r");
         if (conf_fp) {
-                get_perms(conf_fp, ioc_data.uid, &ioc_data.nperms,
+                get_perms(conf_fp, ioc_data.uid,
+                          (int *)&ioc_data.nperms,
                           &ioc_data.perms);
                 fclose(conf_fp);
         }