Print this page
NEX-15279 support NFS server in zone
NEX-15520 online NFS shares cause zoneadm halt to hang in nfs_export_zone_fini
Portions contributed by: Dan Kruchinin dan.kruchinin@nexenta.com
Portions contributed by: Stepan Zastupov stepan.zastupov@gmail.com
Reviewed by: Joyce McIntosh <joyce.mcintosh@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
        
*** 20,30 ****
--- 20,34 ----
   */
  
  /*
   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  */
+ 
+ /*
   * Copyright 2012 Milan Jurik. All rights reserved.
+  * Copyright 2018 Nexenta Systems, Inc.
   */
  
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
*** 2164,2181 ****
  
  static void
  show_group(sa_group_t group, int verbose, int properties, char *proto,
      char *subgroup)
  {
-         sa_share_t share;
          char *groupname;
          char *zfs = NULL;
          int iszfs = 0;
          char *sharepath;
  
          groupname = sa_get_group_attr(group, "name");
          if (groupname != NULL) {
                  if (proto != NULL && !has_protocol(group, proto)) {
                          sa_free_attr_string(groupname);
                          return;
                  }
                  /*
--- 2168,2186 ----
  
  static void
  show_group(sa_group_t group, int verbose, int properties, char *proto,
      char *subgroup)
  {
          char *groupname;
          char *zfs = NULL;
          int iszfs = 0;
          char *sharepath;
  
          groupname = sa_get_group_attr(group, "name");
          if (groupname != NULL) {
+                 sa_share_t share;
+ 
                  if (proto != NULL && !has_protocol(group, proto)) {
                          sa_free_attr_string(groupname);
                          return;
                  }
                  /*
*** 2188,2198 ****
                  zfs = sa_get_group_attr(group, "zfs");
                  if (zfs != NULL) {
                          iszfs = 1;
                          sa_free_attr_string(zfs);
                  }
!                 share = sa_get_share(group, NULL);
                  if (subgroup == NULL)
                          (void) printf("%s", groupname);
                  else
                          (void) printf("    %s/%s", subgroup, groupname);
                  if (properties)
--- 2193,2203 ----
                  zfs = sa_get_group_attr(group, "zfs");
                  if (zfs != NULL) {
                          iszfs = 1;
                          sa_free_attr_string(zfs);
                  }
! 
                  if (subgroup == NULL)
                          (void) printf("%s", groupname);
                  else
                          (void) printf("    %s/%s", subgroup, groupname);
                  if (properties)