D47672.id146706.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47672.id146706.diff
View Options

	diff --git a/contrib/netbsd-tests/lib/libc/sys/t_access.c b/contrib/netbsd-tests/lib/libc/sys/t_access.c
	--- a/contrib/netbsd-tests/lib/libc/sys/t_access.c
	+++ b/contrib/netbsd-tests/lib/libc/sys/t_access.c
	@@ -43,6 +43,7 @@
	#include <fcntl.h>
	#include <limits.h>
	#include <stdint.h>
	+#include <stdio.h>
	#include <stdlib.h>
	#include <unistd.h>

	@@ -176,6 +177,32 @@
	}
	}

	+ATF_TC(access_text);
	+ATF_TC_HEAD(access_text, tc)
	+{
	+ atf_tc_set_md_var(tc, "descr", "Test access(2) for ETXTBSY");
	+}
	+
	+ATF_TC_BODY(access_text, tc)
	+{
	+ char path[PATH_MAX];
	+ int fd;
	+
	+ (void)snprintf(path, sizeof(path), "%s/%s",
	+ atf_tc_get_config_var(tc, "srcdir"), getprogname());
	+
	+ fd = open(path, O_RDONLY);
	+ ATF_REQUIRE(fd >= 0);
	+
	+ ATF_REQUIRE(access(path, W_OK) != 0);
	+ ATF_REQUIRE(errno == ETXTBSY);
	+
	+ ATF_REQUIRE(faccessat(AT_FDCWD, path, W_OK, 0) != 0);
	+ ATF_REQUIRE(errno == ETXTBSY);
	+
	+ ATF_REQUIRE(close(fd) == 0);
	+}
	+
	ATF_TC(access_toolong);
	ATF_TC_HEAD(access_toolong, tc)
	{
	@@ -214,6 +241,7 @@
	ATF_TP_ADD_TC(tp, access_inval);
	ATF_TP_ADD_TC(tp, access_notdir);
	ATF_TP_ADD_TC(tp, access_notexist);
	+ ATF_TP_ADD_TC(tp, access_text);
	ATF_TP_ADD_TC(tp, access_toolong);

	return atf_no_error();
	diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
	--- a/sys/kern/vfs_default.c
	+++ b/sys/kern/vfs_default.c
	@@ -1158,7 +1158,7 @@
	vop_stdis_text(struct vop_is_text_args *ap)
	{

	- return (atomic_load_int(&ap->a_vp->v_writecount) < 0);
	+ return ((int)atomic_load_int(&ap->a_vp->v_writecount) < 0);
	}

	int