NEX-1704 Clustered NFSv4 could cause I/O errors on clients after failover
Reviewed by:  Evan Layton <evan.layton@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>

          --- old/usr/src/cmd/fs.d/nfs/etc/Makefile
          +++ new/usr/src/cmd/fs.d/nfs/etc/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
       25 +# Copyright 2016 Nexenta Systems, Inc.  All rights reserved.
       26 +#
  25   27  
  26   28  DEFAULTFILES = nfs.dfl
  27   29  
  28   30  include ../../../Makefile.cmd
  29   31  
  30   32  ETCNFS= $(ROOTETC)/nfs
       33 +ETCCLUST= $(ROOTETC)/cluster
  31   34  VARNFS= $(ROOT)/var/nfs
  32   35  TXTS= nfssec.conf
  33   36  NFSTXTS= nfslog.conf
       37 +NFSHA= nodeid
  34   38  V4SSDIR= $(VARNFS)/v4_state $(VARNFS)/v4_oldstate
  35   39  
  36   40  IETCFILES=                      $(TXTS:%=$(ROOTETC)/%)
  37   41  INFSETCFILES=                   $(NFSTXTS:%=$(ROOTETC)/nfs/%)
       42 +NFSHAFILE=                      $(NFSHA:%=$(ETCCLUST)/%)
  38   43  
  39   44  FILEMODE= 0644
  40   45  
  41      -all: $(TXTS) $(NFSTXTS)
       46 +all: $(TXTS) $(NFSTXTS) $(NFSHA)
  42   47  
  43   48  install: all $(IETCFILES) $(ETCNFS) $(INFSETCFILES) $(VARNFS) $(V4SSDIR) \
  44      -         $(IDEFFILES) $(ROOTETCDEFAULTFILES)
       49 +         $(IDEFFILES) $(ROOTETCDEFAULTFILES) $(ETCCLUST) $(NFSHAFILE)
  45   50  
  46   51  $(ROOTETC)/%: %
  47   52          $(INS.file)
  48   53  
  49   54  $(ROOTETC)/nfs/%: %
  50   55          $(INS.file)
  51   56  
       57 +$(ETCCLUST):
       58 +        $(INS.dir)
       59 +
  52   60  $(ETCNFS):
  53   61          $(INS.dir)
  54   62  
  55   63  $(VARNFS):
  56   64          $(INS.dir)
  57   65  
  58   66  $(V4SSDIR):
  59   67          $(INS.dir)
  60   68  
       69 +$(ROOTETC)/cluster/%: %
       70 +        $(INS.file)
       71 +
  61   72  .KEEP_STATE:
  62   73  
  63   74  clean clobber lint:
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX