Print this page
re #13613 rb4516 Tunables needs volatile keyword

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/nfs/nfs4_common.c
          +++ new/usr/src/uts/common/fs/nfs/nfs4_common.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  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 (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  23      - *
  24      - * Copyright 2011, 2012 Nexenta Systems, Inc. All rights reserved.
       23 + * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  25   24   * Copyright 2013 Joyent, Inc. All rights reserved.
  26   25   */
  27   26  
  28   27  /*
  29   28   * This is the loadable module wrapper.
  30   29   */
  31   30  #include <sys/systm.h>
  32   31  #include <sys/modctl.h>
  33   32  #include <sys/syscall.h>
  34   33  #include <sys/ddi.h>
↓ open down ↓ 19 lines elided ↑ open up ↑
  54   53          VSW_CANREMOUNT|VSW_NOTZONESAFE|VSW_STATS,
  55   54          NULL
  56   55  };
  57   56  
  58   57  struct modlfs modlfs4 = {
  59   58          &mod_fsops,
  60   59          "network filesystem version 4",
  61   60          &vfw4
  62   61  };
  63   62  
  64      -uint_t nfs4_max_transfer_size = 32 * 1024;
  65      -uint_t nfs4_max_transfer_size_cots = 1024 * 1024;
  66      -uint_t nfs4_max_transfer_size_rdma = 1024 * 1024;
       63 +volatile uint_t nfs4_max_transfer_size = 32 * 1024;
       64 +volatile uint_t nfs4_max_transfer_size_cots = 1024 * 1024;
       65 +volatile uint_t nfs4_max_transfer_size_rdma = 1024 * 1024;
  67   66  
  68   67  int
  69   68  nfs4tsize(void)
  70   69  {
  71   70          /*
  72   71           * For the moment, just return nfs4_max_transfer_size until we
  73   72           * can query the appropriate transport.
  74   73           */
  75   74          return (nfs4_max_transfer_size);
  76   75  }
↓ open down ↓ 457 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX