PERFORCE change 122403 for review
Roman Divacky
rdivacky at FreeBSD.org
Wed Jun 27 14:00:02 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=122403
Change 122403 by rdivacky at rdivacky_witten on 2007/06/27 13:59:49
Style(9) + change mode param in kern_chmod to mode_t to be consistent with kern_lchmod.
Affected files ...
.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#32 edit
.. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#13 edit
Differences ...
==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#32 (text+ko) ====
@@ -966,7 +966,8 @@
int
openat(struct thread *td, struct openat_args *args)
{
- return kern_openat(td, args->path, UIO_USERSPACE, args->flag, args->mode, args->fd);
+ return kern_openat(td, args->path, UIO_USERSPACE, args->flag,
+ args->mode, args->fd);
}
int
@@ -1041,8 +1042,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1
- | MPSAFE, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 |
+ MPSAFE, pathseg, path, td, dir_vn);
if ((flags & O_ACCMODE) == O_ACCMODE) {
error = EINVAL;
@@ -1224,7 +1225,8 @@
int
mknodat(struct thread *td, struct mknodat_args *args)
{
- return kern_mknodat(td, args->path, UIO_USERSPACE, args->mode, args->dev, args->fd);
+ return kern_mknodat(td, args->path, UIO_USERSPACE, args->mode,
+ args->dev, args->fd);
}
int
@@ -1272,8 +1274,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
bwillwrite();
- NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME
- | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0) {
if (dir_vn)
vrele(dir_vn);
@@ -1395,7 +1397,8 @@
}
int
-kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd)
+kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, int mode,
+ int dirfd)
{
struct mount *mp;
struct vattr vattr;
@@ -1412,8 +1415,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
bwillwrite();
- NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME
- | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0) {
if (dir_vn)
vrele(dir_vn);
@@ -1509,9 +1512,11 @@
return (EINVAL);
if (args->flag & AT_SYMLINK_FOLLOW)
- return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, FOLLOW);
+ return kern_linkat(td, args->path1, args->path2,
+ UIO_USERSPACE, args->fd1, args->fd2, FOLLOW);
else
- return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, 0);
+ return kern_linkat(td, args->path1, args->path2,
+ UIO_USERSPACE, args->fd1, args->fd2, 0);
}
static int hardlink_check_uid = 0;
@@ -1575,15 +1580,15 @@
if (error && !kern_absolute_path(path, segflg))
return (error);
- NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE
- | AUDITVNODE1, segflg, path, td, pdir_vn);
+ NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE |
+ AUDITVNODE1, segflg, path, td, pdir_vn);
error = kern_get_at(td, newdirfd, &ldir_vn);
if (error && !kern_absolute_path(link, segflg))
return (error);
- NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME
- | MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn);
+ NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn);
bwillwrite();
if ((error = namei(&ndp)) != 0)
@@ -1708,8 +1713,8 @@
if (error && !kern_absolute_path(link, segflg))
return (error);
bwillwrite();
- NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME
- | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn);
+ NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
vfslocked = NDHASGIANT(&nd);
@@ -1876,8 +1881,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
bwillwrite();
- NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF
- | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0) {
if (dir_vn)
vrele(dir_vn);
@@ -2150,8 +2155,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF
- | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF |
+ MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
/*
* Create and modify a temporary credential instead of one that
@@ -2369,7 +2374,8 @@
}
int
-kern_statat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd)
+kern_statat(struct thread *td, char *path, enum uio_seg pathseg,
+ struct stat *sbp, int dirfd)
{
struct nameidata nd;
struct vnode *dir_vn;
@@ -2380,8 +2386,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED
- | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED |
+ LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
@@ -2437,7 +2443,8 @@
}
int
-kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd)
+kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg,
+ struct stat *sbp, int dirfd)
{
struct nameidata nd;
struct vnode *dir_vn;
@@ -2449,8 +2456,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF
- | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF |
+ LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
@@ -2630,7 +2637,7 @@
ssize_t
readlinkat(struct thread *td, struct readlinkat_args *args)
{
- return kern_readlinkat(td, args->path, UIO_USERSPACE,
+ return kern_readlinkat(td, args->path, UIO_USERSPACE,
args->buf, UIO_USERSPACE, args->bufsize, args->fd);
}
@@ -2656,8 +2663,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF
- | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF |
+ MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
@@ -2901,9 +2908,11 @@
return (EINVAL);
if (args->flag & AT_SYMLINK_NOFOLLOW)
- return kern_lchmodat(td, args->path, UIO_USERSPACE, args->mode, args->dirfd);
+ return kern_lchmodat(td, args->path, UIO_USERSPACE,
+ args->mode, args->dirfd);
else
- return kern_chmodat(td, args->path, UIO_USERSPACE, args->mode, args->dirfd);
+ return kern_chmodat(td, args->path, UIO_USERSPACE,
+ args->mode, args->dirfd);
}
int
@@ -2913,7 +2922,8 @@
}
int
-kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd)
+kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg,
+ mode_t mode, int dirfd)
{
struct nameidata nd;
struct vnode *dir_vn;
@@ -2923,8 +2933,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE
- | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE |
+ AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
@@ -2961,7 +2971,8 @@
int
-kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, mode_t mode, int dirfd)
+kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg,
+ mode_t mode, int dirfd)
{
int error;
struct nameidata nd;
@@ -3087,13 +3098,12 @@
if (args->flag & AT_SYMLINK_NOFOLLOW)
return kern_lchownat(td, args->path, UIO_USERSPACE, args->uid,
- args->gid, args->dirfd);
+ args->gid, args->dirfd);
else
return kern_chownat(td, args->path, UIO_USERSPACE, args->uid,
- args->gid, args->dirfd);
+ args->gid, args->dirfd);
}
-
int
kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid,
int gid)
@@ -3113,8 +3123,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE
- | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE |
+ AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
@@ -3171,8 +3181,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE
- | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE |
+ AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
goto out;
@@ -3354,8 +3364,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
- NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1
- | MPSAFE, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 |
+ MPSAFE, pathseg, path, td, dir_vn);
if ((error = getutimes(tptr, tptrseg, ts)) != 0)
goto out;
@@ -3727,7 +3737,8 @@
int
renameat(struct thread *td, struct renameat_args *args)
{
- return kern_renameat(td, args->old, args->new, UIO_USERSPACE, args->oldfd, args->newfd);
+ return kern_renameat(td, args->old, args->new, UIO_USERSPACE,
+ args->oldfd, args->newfd);
}
int
@@ -3737,7 +3748,8 @@
}
int
-kern_renameat(struct thread *td, char *from, char *to, enum uio_seg pathseg, int fdirfd, int tdirfd)
+kern_renameat(struct thread *td, char *from, char *to, enum uio_seg pathseg,
+ int fdirfd, int tdirfd)
{
struct nameidata fromnd, tond;
struct vnode *fdir_vn, *tdir_vn;
@@ -3755,14 +3767,15 @@
return (error);
#ifdef MAC
- NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF
- | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn);
+ NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn);
#else
- NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | SAVESTART
- | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn);
+ NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT |
+ SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn);
#endif
- NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF
- | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn);
+ NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT |
+ LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2,
+ pathseg, to, td, tdir_vn);
bwillwrite();
if ((error = namei(&fromnd)) != 0)
@@ -3923,8 +3936,8 @@
if (error && !kern_absolute_path(path, segflg))
return (error);
bwillwrite();
- NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME
- | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn);
+ NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn);
nd.ni_cnd.cn_flags |= WILLBEDIR;
if ((error = namei(&nd)) != 0) {
if (dir_vn)
@@ -4027,8 +4040,8 @@
if (error && !kern_absolute_path(path, pathseg))
return (error);
bwillwrite();
- NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF
- | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
+ NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT |
+ LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn);
if ((error = namei(&nd)) != 0)
return (error);
vfslocked = NDHASGIANT(&nd);
==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#13 (text+ko) ====
@@ -67,7 +67,7 @@
int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg,
int mode);
int kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg,
- int mode, int dirfd);
+ mode_t mode, int dirfd);
int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid,
int gid);
int kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg,
More information about the p4-projects
mailing list