From owner-p4-projects@FreeBSD.ORG Thu Jun 21 12:21:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CB2216A46B; Thu, 21 Jun 2007 12:21:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 49A7A16A468 for ; Thu, 21 Jun 2007 12:21:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3A28813C43E for ; Thu, 21 Jun 2007 12:21:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5LCLdGu053835 for ; Thu, 21 Jun 2007 12:21:39 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5LCLdPw053829 for perforce@freebsd.org; Thu, 21 Jun 2007 12:21:39 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 21 Jun 2007 12:21:39 GMT Message-Id: <200706211221.l5LCLdPw053829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jun 2007 12:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=122091 Change 122091 by rdivacky@rdivacky_witten on 2007/06/21 12:21:26 Grrrrr. p4 commited previous version ;( Expand the ATBAD macro and adjust lines wrapping accordingly. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#26 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#26 (text+ko) ==== @@ -78,8 +78,6 @@ #include #include -#define ATBAD ((error) ? ATBADF : 0) - static int chroot_refuse_vdir_fds(struct filedesc *fdp); static int getutimes(const struct timeval *, enum uio_seg, struct timespec *); static int setfown(struct thread *td, struct vnode *, uid_t, gid_t); @@ -1029,7 +1027,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -1246,8 +1245,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | 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); @@ -1373,8 +1372,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | 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); @@ -1515,14 +1514,15 @@ if (error && !kern_absolute_path(path, segflg)) return (error); - NDINIT_AT(&ndp, LOOKUP, ATBAD | 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, ATBAD | 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) @@ -1634,8 +1634,8 @@ if (error && !kern_absolute_path(link, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | 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); @@ -1783,8 +1783,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, ATBAD | 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); @@ -2057,8 +2057,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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 @@ -2267,8 +2267,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -2336,8 +2336,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -2529,8 +2529,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -2776,7 +2776,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -2936,7 +2937,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -2993,7 +2995,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD | 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; @@ -3167,7 +3170,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ATBAD |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; @@ -3553,14 +3557,14 @@ return (error); #ifdef MAC - NDINIT_AT(&fromnd, DELETE, ATBAD | 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, ATBAD | 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, ATBAD | 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) @@ -3708,8 +3712,8 @@ if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ATBAD | 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) @@ -3812,8 +3816,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, ATBAD | 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);