Print this page
re #13613 rb4516 Tunables needs volatile keyword

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/nfs/nfs4_client.c
          +++ new/usr/src/uts/common/fs/nfs/nfs4_client.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) 1986, 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  23   24   * Copyright (c) 2017 by Delphix. All rights reserved.
  24   25   */
  25   26  
  26   27  /*
  27   28   *      Copyright (c) 1983,1984,1985,1986,1987,1988,1989  AT&T.
  28   29   *      All Rights Reserved
  29   30   */
  30   31  
  31   32  #include <sys/param.h>
  32   33  #include <sys/types.h>
↓ open down ↓ 1354 lines elided ↑ open up ↑
1387 1388   * case of future updates to the cpr model.
1388 1389   */
1389 1390  static void
1390 1391  nfs4_async_common_start(struct vfs *vfsp, int async_queue)
1391 1392  {
1392 1393          struct nfs4_async_reqs *args;
1393 1394          mntinfo4_t *mi = VFTOMI4(vfsp);
1394 1395          clock_t time_left = 1;
1395 1396          callb_cpr_t cprinfo;
1396 1397          int i;
1397      -        extern int nfs_async_timeout;
     1398 +        extern volatile int nfs_async_timeout;
1398 1399          int async_types;
1399 1400          kcondvar_t *async_work_cv;
1400 1401  
1401 1402          if (async_queue == NFS4_ASYNC_QUEUE) {
1402 1403                  async_types = NFS4_ASYNC_TYPES;
1403 1404                  async_work_cv = &mi->mi_async_work_cv[NFS4_ASYNC_QUEUE];
1404 1405          } else {
1405 1406                  async_types = NFS4_ASYNC_PGOPS_TYPES;
1406 1407                  async_work_cv = &mi->mi_async_work_cv[NFS4_ASYNC_PGOPS_QUEUE];
1407 1408          }
↓ open down ↓ 2991 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX