[Midnightbsd-cvs] src [7294] trunk/sys/i386/ibcs2: amode -> flags rename
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Sep 4 17:37:29 EDT 2015
Revision: 7294
http://svnweb.midnightbsd.org/src/?rev=7294
Author: laffer1
Date: 2015-09-04 17:37:29 -0400 (Fri, 04 Sep 2015)
Log Message:
-----------
amode -> flags rename
Modified Paths:
--------------
trunk/sys/i386/ibcs2/ibcs2_fcntl.c
trunk/sys/i386/ibcs2/imgact_coff.c
trunk/sys/i386/ibcs2/syscalls.master
Modified: trunk/sys/i386/ibcs2/ibcs2_fcntl.c
===================================================================
--- trunk/sys/i386/ibcs2/ibcs2_fcntl.c 2015-09-04 21:34:23 UTC (rev 7293)
+++ trunk/sys/i386/ibcs2/ibcs2_fcntl.c 2015-09-04 21:37:29 UTC (rev 7294)
@@ -243,7 +243,7 @@
int error;
CHECKALTEXIST(td, uap->path, &path);
- error = kern_access(td, path, UIO_SYSSPACE, uap->amode);
+ error = kern_access(td, path, UIO_SYSSPACE, uap->flags);
free(path, M_TEMP);
return (error);
}
Modified: trunk/sys/i386/ibcs2/imgact_coff.c
===================================================================
--- trunk/sys/i386/ibcs2/imgact_coff.c 2015-09-04 21:34:23 UTC (rev 7293)
+++ trunk/sys/i386/ibcs2/imgact_coff.c 2015-09-04 21:37:29 UTC (rev 7294)
@@ -168,7 +168,7 @@
unsigned long text_offset = 0, text_address = 0, text_size = 0;
unsigned long data_offset = 0, data_address = 0, data_size = 0;
unsigned long bss_size = 0;
- int i;
+ int i, writecount;
NDINIT(&nd, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME,
UIO_SYSSPACE, name, td);
@@ -181,7 +181,10 @@
if (vp == NULL)
return ENOEXEC;
- if (vp->v_writecount) {
+ error = VOP_GET_WRITECOUNT(vp, &writecount);
+ if (error != 0)
+ goto fail;
+ if (writecount != 0) {
error = ETXTBSY;
goto fail;
}
Modified: trunk/sys/i386/ibcs2/syscalls.master
===================================================================
--- trunk/sys/i386/ibcs2/syscalls.master 2015-09-04 21:34:23 UTC (rev 7293)
+++ trunk/sys/i386/ibcs2/syscalls.master 2015-09-04 21:37:29 UTC (rev 7294)
@@ -80,7 +80,7 @@
struct ibcs2_utimbuf *buf); }
31 AUE_NULL UNIMPL ibcs2_stty
32 AUE_NULL UNIMPL ibcs2_gtty
-33 AUE_ACCESS STD { int ibcs2_access(char *path, int amode); }
+33 AUE_ACCESS STD { int ibcs2_access(char *path, int flags); }
34 AUE_NICE STD { int ibcs2_nice(int incr); }
35 AUE_STATFS STD { int ibcs2_statfs(char *path, \
struct ibcs2_statfs *buf, int len, \
More information about the Midnightbsd-cvs
mailing list