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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/zfs_vfsops.c
          +++ new/usr/src/uts/common/fs/zfs/zfs_vfsops.c
↓ open down ↓ 76 lines elided ↑ open up ↑
  77   77  
  78   78  static int zfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr);
  79   79  static int zfs_umount(vfs_t *vfsp, int fflag, cred_t *cr);
  80   80  static int zfs_mountroot(vfs_t *vfsp, enum whymountroot);
  81   81  static int zfs_root(vfs_t *vfsp, vnode_t **vpp);
  82   82  static int zfs_statvfs(vfs_t *vfsp, struct statvfs64 *statp);
  83   83  static int zfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp);
  84   84  static void zfs_freevfs(vfs_t *vfsp);
  85   85  
  86   86  static const fs_operation_def_t zfs_vfsops_template[] = {
  87      -        VFSNAME_MOUNT,          { .vfs_mount = zfs_mount },
  88      -        VFSNAME_MOUNTROOT,      { .vfs_mountroot = zfs_mountroot },
  89      -        VFSNAME_UNMOUNT,        { .vfs_unmount = zfs_umount },
  90      -        VFSNAME_ROOT,           { .vfs_root = zfs_root },
  91      -        VFSNAME_STATVFS,        { .vfs_statvfs = zfs_statvfs },
  92      -        VFSNAME_SYNC,           { .vfs_sync = zfs_sync },
  93      -        VFSNAME_VGET,           { .vfs_vget = zfs_vget },
  94      -        VFSNAME_FREEVFS,        { .vfs_freevfs = zfs_freevfs },
  95      -        NULL,                   NULL
       87 +        { VFSNAME_MOUNT,        { .vfs_mount = zfs_mount } },
       88 +        { VFSNAME_MOUNTROOT,    { .vfs_mountroot = zfs_mountroot } },
       89 +        { VFSNAME_UNMOUNT,      { .vfs_unmount = zfs_umount } },
       90 +        { VFSNAME_ROOT,         { .vfs_root = zfs_root } },
       91 +        { VFSNAME_STATVFS,      { .vfs_statvfs = zfs_statvfs } },
       92 +        { VFSNAME_SYNC,         { .vfs_sync = zfs_sync } },
       93 +        { VFSNAME_VGET,         { .vfs_vget = zfs_vget } },
       94 +        { VFSNAME_FREEVFS,      { .vfs_freevfs = zfs_freevfs } },
       95 +        { NULL,                 { NULL } }
  96   96  };
  97   97  
  98   98  static const fs_operation_def_t zfs_vfsops_eio_template[] = {
  99      -        VFSNAME_FREEVFS,        { .vfs_freevfs =  zfs_freevfs },
 100      -        NULL,                   NULL
       99 +        { VFSNAME_FREEVFS,      { .vfs_freevfs =  zfs_freevfs } },
      100 +        { NULL,                 { NULL } }
 101  101  };
 102  102  
 103  103  /*
 104  104   * We need to keep a count of active fs's.
 105  105   * This is necessary to prevent our module
 106  106   * from being unloaded after a umount -f
 107  107   */
 108  108  static uint32_t zfs_active_fs_count = 0;
 109  109  
 110  110  static char *noatime_cancel[] = { MNTOPT_ATIME, NULL };
↓ open down ↓ 2176 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX