Print this page
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/namefs/namevfs.c
          +++ new/usr/src/uts/common/fs/namefs/namevfs.c
↓ open down ↓ 658 lines elided ↑ open up ↑
 659  659  }
 660  660  
 661  661  /*
 662  662   * File system initialization routine. Save the file system type,
 663  663   * establish a file system device number and initialize nm_filevp_hash[].
 664  664   */
 665  665  int
 666  666  nameinit(int fstype, char *name)
 667  667  {
 668  668          static const fs_operation_def_t nm_vfsops_template[] = {
 669      -                VFSNAME_MOUNT,          { .vfs_mount = nm_mount },
 670      -                VFSNAME_UNMOUNT,        { .vfs_unmount = nm_unmount },
 671      -                VFSNAME_ROOT,           { .vfs_root = nm_root },
 672      -                VFSNAME_STATVFS,        { .vfs_statvfs = nm_statvfs },
 673      -                VFSNAME_SYNC,           { .vfs_sync = nm_sync },
 674      -                NULL,                   NULL
      669 +                { VFSNAME_MOUNT,        { .vfs_mount = nm_mount } },
      670 +                { VFSNAME_UNMOUNT,      { .vfs_unmount = nm_unmount } },
      671 +                { VFSNAME_ROOT,         { .vfs_root = nm_root } },
      672 +                { VFSNAME_STATVFS,      { .vfs_statvfs = nm_statvfs } },
      673 +                { VFSNAME_SYNC,         { .vfs_sync = nm_sync } },
      674 +                { NULL,                 { NULL } }
 675  675          };
 676  676          static const fs_operation_def_t nm_dummy_vfsops_template[] = {
 677      -                VFSNAME_STATVFS,        { .vfs_statvfs = nm_statvfs },
 678      -                VFSNAME_SYNC,           { .vfs_sync = nm_sync },
 679      -                NULL,                   NULL
      677 +                { VFSNAME_STATVFS,      { .vfs_statvfs = nm_statvfs } },
      678 +                { VFSNAME_SYNC,         { .vfs_sync = nm_sync } },
      679 +                { NULL,                 { NULL } }
 680  680          };
 681  681          int error;
 682  682          int dev;
 683  683          vfsops_t *dummy_vfsops;
 684  684  
 685  685          error = vfs_setfsops(fstype, nm_vfsops_template, &namefs_vfsops);
 686  686          if (error != 0) {
 687  687                  cmn_err(CE_WARN, "nameinit: bad vfs ops template");
 688  688                  return (error);
 689  689          }
↓ open down ↓ 45 lines elided ↑ open up ↑
 735  735  };
 736  736  
 737  737  /*
 738  738   * Module linkage information for the kernel.
 739  739   */
 740  740  static struct modlfs modlfs = {
 741  741          &mod_fsops, "filesystem for namefs", &vfw
 742  742  };
 743  743  
 744  744  static struct modlinkage modlinkage = {
 745      -        MODREV_1, (void *)&modlfs, NULL
      745 +        MODREV_1, { (void *)&modlfs, NULL }
 746  746  };
 747  747  
 748  748  int
 749  749  _init(void)
 750  750  {
 751  751          namenodeno_init();
 752  752          return (mod_install(&modlinkage));
 753  753  }
 754  754  
 755  755  int
 756  756  _fini(void)
 757  757  {
 758  758          return (EBUSY);
 759  759  }
 760  760  
 761  761  int
 762  762  _info(struct modinfo *modinfop)
 763  763  {
 764  764          return (mod_info(&modlinkage, modinfop));
 765  765  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX