Module Name: src
Committed By: riastradh
Date: Sat Apr 29 06:34:20 UTC 2023
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
kern/vfs_syscalls.c: Nix trailing whitesapce.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.558 -r1.559 src/sys/kern/vfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.558 src/sys/kern/vfs_syscalls.c:1.559
--- src/sys/kern/vfs_syscalls.c:1.558 Sun Apr 9 09:18:09 2023
+++ src/sys/kern/vfs_syscalls.c Sat Apr 29 06:34:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.558 2023/04/09 09:18:09 riastradh Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.559 2023/04/29 06:34:20 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.558 2023/04/09 09:18:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.559 2023/04/29 06:34:20 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -229,7 +229,7 @@ const struct filterops fs_filtops = {
.f_event = filt_fs,
};
-static int
+static int
fd_nameiat(struct lwp *l, int fdat, struct nameidata *ndp)
{
file_t *dfp;
@@ -247,7 +247,7 @@ fd_nameiat(struct lwp *l, int fdat, stru
if (fdat != AT_FDCWD)
fd_putfile(fdat);
out:
- return error;
+ return error;
}
static int
@@ -272,7 +272,7 @@ fd_nameiat_simple_user(struct lwp *l, in
if (fdat != AT_FDCWD)
fd_putfile(fdat);
out:
- return error;
+ return error;
}
static int
@@ -415,9 +415,9 @@ mount_update(struct lwp *l, struct vnode
mutex_exit(mp->mnt_updating);
vfs_resume(mp);
- if ((error == 0) && !(saved_flags & MNT_EXTATTR) &&
+ if ((error == 0) && !(saved_flags & MNT_EXTATTR) &&
(flags & MNT_EXTATTR)) {
- if (VFS_EXTATTRCTL(mp, EXTATTR_CMD_START,
+ if (VFS_EXTATTRCTL(mp, EXTATTR_CMD_START,
NULL, 0, NULL) != 0) {
printf("%s: failed to start extattr, error = %d",
mp->mnt_stat.f_mntonname, error);
@@ -425,9 +425,9 @@ mount_update(struct lwp *l, struct vnode
}
}
- if ((error == 0) && (saved_flags & MNT_EXTATTR) &&
+ if ((error == 0) && (saved_flags & MNT_EXTATTR) &&
!(flags & MNT_EXTATTR)) {
- if (VFS_EXTATTRCTL(mp, EXTATTR_CMD_STOP,
+ if (VFS_EXTATTRCTL(mp, EXTATTR_CMD_STOP,
NULL, 0, NULL) != 0) {
printf("%s: failed to stop extattr, error = %d",
mp->mnt_stat.f_mntonname, error);
@@ -497,7 +497,7 @@ mount_getargs(struct lwp *l, struct vnod
mp = vp->v_mount;
- /* XXX: probably some notion of "can see" here if we want isolation. */
+ /* XXX: probably some notion of "can see" here if we want isolation. */
error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_MOUNT,
KAUTH_REQ_SYSTEM_MOUNT_GET, mp, data, NULL);
if (error)
@@ -1715,7 +1715,7 @@ chdir_lookup(const char *path, int where
* like posix_spawn post-processing).
*/
int
-do_open(lwp_t *l, struct vnode *dvp, struct pathbuf *pb, int open_flags,
+do_open(lwp_t *l, struct vnode *dvp, struct pathbuf *pb, int open_flags,
int open_mode, int *fd)
{
struct proc *p = l->l_proc;
@@ -1734,7 +1734,7 @@ do_open(lwp_t *l, struct vnode *dvp, str
/*
* Only one of the O_EXEC, O_RDONLY, O_WRONLY and O_RDWR flags
* may be specified.
- */
+ */
if ((open_flags & O_EXEC) && (open_flags & O_ACCMODE))
return EINVAL;
@@ -1748,7 +1748,7 @@ do_open(lwp_t *l, struct vnode *dvp, str
/* We're going to read cwdi->cwdi_cmask unlocked here. */
cmode = ((open_mode &~ cwdi->cwdi_cmask) & ALLPERMS) &~ S_ISTXT;
-
+
error = vn_open(dvp, pb, TRYEMULROOT, flags, cmode,
&vp, &dupfd_move, &dupfd);
if (error != 0) {
@@ -1819,7 +1819,7 @@ no_compat:
pathstring = pathbuf_stringcopy_get(pb);
- /*
+ /*
* fdat is ignored if:
* 1) if fdat is AT_FDCWD, which means use current directory as base.
* 2) if path is absolute, then fdat is useless.
@@ -2504,7 +2504,7 @@ sys_mkfifo(struct lwp *l, const struct s
}
int
-sys_mkfifoat(struct lwp *l, const struct sys_mkfifoat_args *uap,
+sys_mkfifoat(struct lwp *l, const struct sys_mkfifoat_args *uap,
register_t *retval)
{
/* {
@@ -2513,7 +2513,7 @@ sys_mkfifoat(struct lwp *l, const struct
syscallarg(int) mode;
} */
- return do_sys_mkfifoat(l, SCARG(uap, fd), SCARG(uap, path),
+ return do_sys_mkfifoat(l, SCARG(uap, fd), SCARG(uap, path),
SCARG(uap, mode));
}
@@ -2564,7 +2564,7 @@ do_sys_mkfifoat(struct lwp *l, int fdat,
/* ARGSUSED */
int
do_sys_linkat(struct lwp *l, int fdpath, const char *path, int fdlink,
- const char *link, int follow, register_t *retval)
+ const char *link, int follow, register_t *retval)
{
struct vnode *vp;
struct pathbuf *linkpb;
@@ -2740,7 +2740,7 @@ sys_symlink(struct lwp *l, const struct
}
int
-sys_symlinkat(struct lwp *l, const struct sys_symlinkat_args *uap,
+sys_symlinkat(struct lwp *l, const struct sys_symlinkat_args *uap,
register_t *retval)
{
/* {
@@ -2907,7 +2907,7 @@ do_sys_unlinkat(struct lwp *l, int fdat,
goto abort;
}
#endif /* NVERIEXEC > 0 */
-
+
#ifdef FILEASSOC
(void)fileassoc_file_delete(vp);
#endif /* FILEASSOC */
@@ -3128,7 +3128,7 @@ do_sys_accessat(struct lwp *l, int fdat,
nd_flag &= ~FOLLOW;
error = pathbuf_copyin(path, &pb);
- if (error)
+ if (error)
return error;
NDINIT(&nd, LOOKUP, nd_flag, pb);
@@ -3195,7 +3195,7 @@ do_sys_stat(const char *userpath, unsign
int
do_sys_statat(struct lwp *l, int fdat, const char *userpath,
- unsigned int nd_flag, struct stat *sb)
+ unsigned int nd_flag, struct stat *sb)
{
int error;
struct pathbuf *pb;
@@ -3280,7 +3280,7 @@ sys_fstatat(struct lwp *l, const struct
else
nd_flag = FOLLOW;
- error = do_sys_statat(l, SCARG(uap, fd), SCARG(uap, path), nd_flag,
+ error = do_sys_statat(l, SCARG(uap, fd), SCARG(uap, path), nd_flag,
&sb);
if (error)
return error;
@@ -3321,7 +3321,7 @@ sys_pathconf(struct lwp *l, const struct
syscallarg(const char *) path;
syscallarg(int) name;
} */
- return kern_pathconf(retval, SCARG(uap, path), SCARG(uap, name),
+ return kern_pathconf(retval, SCARG(uap, path), SCARG(uap, name),
FOLLOW);
}
@@ -3334,7 +3334,7 @@ sys_lpathconf(struct lwp *l, const struc
syscallarg(const char *) path;
syscallarg(int) name;
} */
- return kern_pathconf(retval, SCARG(uap, path), SCARG(uap, name),
+ return kern_pathconf(retval, SCARG(uap, path), SCARG(uap, name),
NOFOLLOW);
}
@@ -3960,7 +3960,7 @@ sys_utimensat(struct lwp *l, const struc
tptr = SCARG(uap, tptr);
follow = (SCARG(uap, flag) & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW;
- error = do_sys_utimensat(l, SCARG(uap, fd), NULL,
+ error = do_sys_utimensat(l, SCARG(uap, fd), NULL,
SCARG(uap, path), follow, tptr, UIO_USERSPACE);
return error;
@@ -3988,7 +3988,7 @@ do_sys_utimensat(struct lwp *l, int fdat
KASSERT(l != NULL || fdat == AT_FDCWD);
- /*
+ /*
* I have checked all callers and they pass either FOLLOW,
* NOFOLLOW, or 0 (when they don't pass a path), and NOFOLLOW
* is 0. More to the point, they don't pass anything else.
@@ -3996,7 +3996,7 @@ do_sys_utimensat(struct lwp *l, int fdat
* are fully sanitized.
*/
KASSERT(flag == NOFOLLOW || flag == FOLLOW);
- sflags = (flag == FOLLOW) ?
+ sflags = (flag == FOLLOW) ?
NSM_FOLLOW_TRYEMULROOT : NSM_NOFOLLOW_TRYEMULROOT;
if (tptr == NULL) {
@@ -4064,7 +4064,7 @@ do_sys_utimes(struct lwp *l, struct vnod
struct timespec ts[2];
struct timespec *tsptr = NULL;
int error;
-
+
if (tptr != NULL) {
struct timeval tv[2];
@@ -4075,7 +4075,7 @@ do_sys_utimes(struct lwp *l, struct vnod
tptr = tv;
}
- if ((tptr[0].tv_usec == UTIME_NOW) ||
+ if ((tptr[0].tv_usec == UTIME_NOW) ||
(tptr[0].tv_usec == UTIME_OMIT))
ts[0].tv_nsec = tptr[0].tv_usec;
else {
@@ -4085,7 +4085,7 @@ do_sys_utimes(struct lwp *l, struct vnod
TIMEVAL_TO_TIMESPEC(&tptr[0], &ts[0]);
}
- if ((tptr[1].tv_usec == UTIME_NOW) ||
+ if ((tptr[1].tv_usec == UTIME_NOW) ||
(tptr[1].tv_usec == UTIME_OMIT))
ts[1].tv_nsec = tptr[1].tv_usec;
else {
@@ -4095,7 +4095,7 @@ do_sys_utimes(struct lwp *l, struct vnod
TIMEVAL_TO_TIMESPEC(&tptr[1], &ts[1]);
}
- tsptr = &ts[0];
+ tsptr = &ts[0];
}
return do_sys_utimens(l, vp, path, flag, tsptr, UIO_SYSSPACE);
@@ -4310,12 +4310,12 @@ sys_rename(struct lwp *l, const struct s
syscallarg(const char *) to;
} */
- return (do_sys_renameat(l, AT_FDCWD, SCARG(uap, from), AT_FDCWD,
+ return (do_sys_renameat(l, AT_FDCWD, SCARG(uap, from), AT_FDCWD,
SCARG(uap, to), UIO_USERSPACE, 0));
}
int
-sys_renameat(struct lwp *l, const struct sys_renameat_args *uap,
+sys_renameat(struct lwp *l, const struct sys_renameat_args *uap,
register_t *retval)
{
/* {
@@ -4900,12 +4900,12 @@ sys_posix_fallocate(struct lwp *l, const
fd = SCARG(uap, fd);
pos = SCARG(uap, pos);
len = SCARG(uap, len);
-
+
if (pos < 0 || len < 0 || len > OFF_T_MAX - pos) {
*retval = EINVAL;
return 0;
}
-
+
error = fd_getvnode(fd, &fp);
if (error) {
*retval = error;
@@ -4958,7 +4958,7 @@ sys_fdiscard(struct lwp *l, const struct
if (pos < 0 || len < 0 || len > OFF_T_MAX - pos) {
return EINVAL;
}
-
+
error = fd_getvnode(fd, &fp);
if (error) {
return error;
