Print this page
5255 uts shouldn't open-code ISP2

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
          +++ new/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  25   25   * Copyright (c) 2013 by Delphix. All rights reserved.
  26   26   */
  27   27  
       28 +#include <sys/sysmacros.h>
  28   29  #include <sys/conf.h>
  29   30  #include <sys/file.h>
  30   31  #include <sys/ddi.h>
  31   32  #include <sys/sunddi.h>
  32   33  #include <sys/modctl.h>
  33   34  #include <sys/scsi/scsi.h>
  34   35  #include <sys/scsi/impl/scsi_reset_notify.h>
  35   36  #include <sys/disp.h>
  36   37  #include <sys/byteorder.h>
  37   38  #include <sys/pathname.h>
↓ open down ↓ 1791 lines elided ↑ open up ↑
1829 1830                  sl->sl_flags |= SL_PID_VALID;
1830 1831          }
1831 1832          if (slu->slu_rev_valid) {
1832 1833                  bcopy(slu->slu_rev, sl->sl_revision, 4);
1833 1834                  sl->sl_flags |= SL_REV_VALID;
1834 1835          }
1835 1836          if (slu->slu_write_protected) {
1836 1837                  sl->sl_flags |= SL_WRITE_PROTECTED;
1837 1838          }
1838 1839          if (slu->slu_blksize_valid) {
1839      -                if ((slu->slu_blksize & (slu->slu_blksize - 1)) ||
     1840 +                if (!ISP2(slu->slu_blksize) ||
1840 1841                      (slu->slu_blksize > (32 * 1024)) ||
1841 1842                      (slu->slu_blksize == 0)) {
1842 1843                          *err_ret = SBD_RET_INVALID_BLKSIZE;
1843 1844                          ret = EINVAL;
1844 1845                          goto scm_err_out;
1845 1846                  }
1846 1847                  while ((1 << sl->sl_data_blocksize_shift) != slu->slu_blksize) {
1847 1848                          sl->sl_data_blocksize_shift++;
1848 1849                  }
1849 1850          } else {
↓ open down ↓ 1867 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX