Date: Thu, 18 Jan 2007 10:16:11 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 113102 for review Message-ID: <200701181016.l0IAGB2s033193@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=113102 Change 113102 by rdivacky@rdivacky_witten on 2007/01/18 10:15:16 Fix mismerge by IFC Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#12 (text+ko) ==== @@ -120,9 +120,9 @@ bsd_flags |= O_EXCL; if (l_flags & LINUX_O_NOCTTY) bsd_flags |= O_NOCTTY; - if (args->flags & LINUX_O_DIRECT) + if (l_flags & LINUX_O_DIRECT) bsd_flags |= O_DIRECT; - if (args->flags & LINUX_O_NOFOLLOW) + if (l_flags & LINUX_O_NOFOLLOW) bsd_flags |= O_NOFOLLOW; /* XXX LINUX_O_NOATIME: unable to be easily implemented. */ @@ -149,7 +149,7 @@ PROC_UNLOCK(p); sx_sunlock(&proctree_lock); } - if (args->flags & LINUX_O_DIRECTORY) { + if (l_flags & LINUX_O_DIRECTORY) { if (fp->f_type != DTYPE_VNODE || fp->f_vnode->v_type != VDIR) { error = ENOTDIR;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701181016.l0IAGB2s033193>