Whamcloud - gitweb
LU-8829 mgs: fix default secure RPC rule display 56/23756/2
authorJohn L. Hammond <john.hammond@intel.com>
Mon, 14 Nov 2016 18:45:08 +0000 (12:45 -0600)
committerOleg Drokin <oleg.drokin@intel.com>
Thu, 17 Nov 2016 04:31:09 +0000 (04:31 +0000)
In seq_show_srpc_rules() ensure that the default Secure RPC rule is
displayed properly.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Ifbb43012e92dfd22bc8caf028ddc9f1658cc5084
Reviewed-on: http://review.whamcloud.com/23756
Tested-by: Jenkins
Reviewed-by: Nathan Lavender <nblavend@iu.edu>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/mgs/lproc_mgs.c

index 134c829..ef22f46 100644 (file)
@@ -81,19 +81,23 @@ out:
 LPROC_SEQ_FOPS_RO(mgs_fs);
 
 static void seq_show_srpc_rules(struct seq_file *seq, const char *tgtname,
-                                struct sptlrpc_rule_set *rset)
+                               struct sptlrpc_rule_set *rset)
 {
-        struct sptlrpc_rule    *r;
-        char                    dirbuf[10];
-        char                    flvrbuf[40];
-       char                    net[LNET_NIDSTR_SIZE] = "default";
-        int                     i;
+       struct sptlrpc_rule *r;
+       char dirbuf[10];
+       char flvrbuf[40];
+       char net_buf[LNET_NIDSTR_SIZE];
+       const char *net;
+       int i;
 
-        for (i = 0; i < rset->srs_nrule; i++) {
-                r = &rset->srs_rules[i];
+       for (i = 0; i < rset->srs_nrule; i++) {
+               r = &rset->srs_rules[i];
 
-               if (r->sr_netid != LNET_NIDNET(LNET_NID_ANY))
-                       libcfs_net2str_r(r->sr_netid, net, sizeof(net));
+               if (r->sr_netid == LNET_NIDNET(LNET_NID_ANY))
+                       net = "default";
+               else
+                       net = libcfs_net2str_r(r->sr_netid, net_buf,
+                                              sizeof(net_buf));
 
                 if (r->sr_from == LUSTRE_SP_ANY && r->sr_to == LUSTRE_SP_ANY)
                         dirbuf[0] = '\0';