diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2018-01-05 05:53:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2018-01-05 05:53:57 +0000 |
| commit | 3ec3790d4d656d72b2ba9ed55fba8a3dd0761b15 (patch) | |
| tree | 0fc96b2db2a80f99a6a9a6861b9bdf23d0376622 /sys | |
| parent | 37b34962aa7f037ccb80f9b2e6073e5a206e59c2 (diff) | |
backout, because it breaks builds in dev/microcode.
Always build the parts of the tree that use a file.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/_endian.h | 11 | ||||
| -rw-r--r-- | sys/sys/mount.h | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/sys/sys/_endian.h b/sys/sys/_endian.h index 4a279688172..b87a1582b87 100644 --- a/sys/sys/_endian.h +++ b/sys/sys/_endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: _endian.h,v 1.5 2018/01/05 05:08:53 dlg Exp $ */ +/* $OpenBSD: _endian.h,v 1.6 2018/01/05 05:53:56 deraadt Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. @@ -83,12 +83,9 @@ __swap64md(__uint64_t x) } #endif -#define __swap16(x) \ - (__uint16_t)(__builtin_constant_p(x) ? __swap16gen(x) : __swap16md(x)) -#define __swap32(x) - (__uint32_t)(__builtin_constant_p(x) ? __swap32gen(x) : __swap32md(x)) -#define __swap64(x) \ - (__uint64_t)(__builtin_constant_p(x) ? __swap64gen(x) : __swap64md(x)) +#define __swap16(x) (__builtin_constant_p(x) ? __swap16gen(x) : __swap16md(x)) +#define __swap32(x) (__builtin_constant_p(x) ? __swap32gen(x) : __swap32md(x)) +#define __swap64(x) (__builtin_constant_p(x) ? __swap64gen(x) : __swap64md(x)) #if _BYTE_ORDER == _LITTLE_ENDIAN diff --git a/sys/sys/mount.h b/sys/sys/mount.h index d0783229211..42ed21ad380 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.132 2017/12/11 05:27:40 deraadt Exp $ */ +/* $OpenBSD: mount.h,v 1.133 2018/01/05 05:53:56 deraadt Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -389,6 +389,7 @@ struct mount { #define MNT_DELEXPORT 0x00020000 /* delete export host lists */ #define MNT_RELOAD 0x00040000 /* reload filesystem data */ #define MNT_FORCE 0x00080000 /* force unmount or readonly change */ +#define MNT_STALLED 0x00100000 /* filesystem stalled */ #define MNT_WANTRDWR 0x02000000 /* want upgrade to read/write */ #define MNT_SOFTDEP 0x04000000 /* soft dependencies being done */ #define MNT_DOOMED 0x08000000 /* device behind filesystem is gone */ @@ -505,7 +506,7 @@ struct vfsops { caddr_t arg, struct proc *p); int (*vfs_statfs)(struct mount *mp, struct statfs *sbp, struct proc *p); - int (*vfs_sync)(struct mount *mp, int waitfor, + int (*vfs_sync)(struct mount *mp, int waitfor, int stall, struct ucred *cred, struct proc *p); int (*vfs_vget)(struct mount *mp, ino_t ino, struct vnode **vpp); @@ -526,7 +527,7 @@ struct vfsops { #define VFS_ROOT(MP, VPP) (*(MP)->mnt_op->vfs_root)(MP, VPP) #define VFS_QUOTACTL(MP,C,U,A,P) (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, P) #define VFS_STATFS(MP, SBP, P) (*(MP)->mnt_op->vfs_statfs)(MP, SBP, P) -#define VFS_SYNC(MP, WAIT, C, P) (*(MP)->mnt_op->vfs_sync)(MP, WAIT, C, P) +#define VFS_SYNC(MP, W, S, C, P) (*(MP)->mnt_op->vfs_sync)(MP, W, S, C, P) #define VFS_VGET(MP, INO, VPP) (*(MP)->mnt_op->vfs_vget)(MP, INO, VPP) #define VFS_FHTOVP(MP, FIDP, VPP) \ (*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, VPP) @@ -573,6 +574,7 @@ int vfs_mountedon(struct vnode *); int vfs_rootmountalloc(char *, char *, struct mount **); void vfs_unbusy(struct mount *); extern TAILQ_HEAD(mntlist, mount) mountlist; +int vfs_stall(struct proc *, int); struct mount *getvfs(fsid_t *); /* return vfs given fsid */ /* process mount export info */ |