From owner-svn-src-all@freebsd.org Sat Apr 6 09:37:13 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 334FF157CB02; Sat, 6 Apr 2019 09:37:13 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C63A1719A1; Sat, 6 Apr 2019 09:37:12 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A001122BC8; Sat, 6 Apr 2019 09:37:12 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x369bCBL043697; Sat, 6 Apr 2019 09:37:12 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x369bApJ043685; Sat, 6 Apr 2019 09:37:10 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201904060937.x369bApJ043685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sat, 6 Apr 2019 09:37:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345983 - in head/sys: compat/freebsd32 kern sys X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: in head/sys: compat/freebsd32 kern sys X-SVN-Commit-Revision: 345983 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C63A1719A1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Apr 2019 09:37:13 -0000 Author: oshogbo Date: Sat Apr 6 09:37:10 2019 New Revision: 345983 URL: https://svnweb.freebsd.org/changeset/base/345983 Log: Regen after r345982. Modified: head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c head/sys/kern/init_sysent.c head/sys/kern/syscalls.c head/sys/kern/systrace_args.c head/sys/sys/syscall.h head/sys/sys/syscall.mk head/sys/sys/sysproto.h Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Sat Apr 6 09:37:10 2019 (r345983) @@ -494,4 +494,5 @@ #define FREEBSD32_SYS_fhlink 565 #define FREEBSD32_SYS_fhlinkat 566 #define FREEBSD32_SYS_fhreadlink 567 -#define FREEBSD32_SYS_MAXSYSCALL 568 +#define FREEBSD32_SYS_funlinkat 568 +#define FREEBSD32_SYS_MAXSYSCALL 569 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Sat Apr 6 09:37:10 2019 (r345983) @@ -604,4 +604,5 @@ const char *freebsd32_syscallnames[] = { "fhlink", /* 565 = fhlink */ "fhlinkat", /* 566 = fhlinkat */ "fhreadlink", /* 567 = fhreadlink */ + "funlinkat", /* 568 = funlinkat */ }; Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Sat Apr 6 09:37:10 2019 (r345983) @@ -651,4 +651,5 @@ struct sysent freebsd32_sysent[] = { { AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 565 = fhlink */ { AS(fhlinkat_args), (sy_call_t *)sys_fhlinkat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 566 = fhlinkat */ { AS(fhreadlink_args), (sy_call_t *)sys_fhreadlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 567 = fhreadlink */ + { AS(funlinkat_args), (sy_call_t *)sys_funlinkat, AUE_UNLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 568 = funlinkat */ }; Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Sat Apr 6 09:37:10 2019 (r345983) @@ -3310,6 +3310,16 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 3; break; } + /* funlinkat */ + case 568: { + struct funlinkat_args *p = params; + iarg[0] = p->dfd; /* int */ + uarg[1] = (intptr_t) p->path; /* const char * */ + iarg[2] = p->fd; /* int */ + iarg[3] = p->flag; /* int */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8905,6 +8915,25 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; + /* funlinkat */ + case 568: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -10771,6 +10800,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* fhreadlink */ case 567: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* funlinkat */ + case 568: if (ndx == 0 || ndx == 1) p = "int"; break; Modified: head/sys/kern/init_sysent.c ============================================================================== --- head/sys/kern/init_sysent.c Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/kern/init_sysent.c Sat Apr 6 09:37:10 2019 (r345983) @@ -617,4 +617,5 @@ struct sysent sysent[] = { { AS(fhlink_args), (sy_call_t *)sys_fhlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 565 = fhlink */ { AS(fhlinkat_args), (sy_call_t *)sys_fhlinkat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 566 = fhlinkat */ { AS(fhreadlink_args), (sy_call_t *)sys_fhreadlink, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 567 = fhreadlink */ + { AS(funlinkat_args), (sy_call_t *)sys_funlinkat, AUE_UNLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 568 = funlinkat */ }; Modified: head/sys/kern/syscalls.c ============================================================================== --- head/sys/kern/syscalls.c Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/kern/syscalls.c Sat Apr 6 09:37:10 2019 (r345983) @@ -574,4 +574,5 @@ const char *syscallnames[] = { "fhlink", /* 565 = fhlink */ "fhlinkat", /* 566 = fhlinkat */ "fhreadlink", /* 567 = fhreadlink */ + "funlinkat", /* 568 = funlinkat */ }; Modified: head/sys/kern/systrace_args.c ============================================================================== --- head/sys/kern/systrace_args.c Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/kern/systrace_args.c Sat Apr 6 09:37:10 2019 (r345983) @@ -3302,6 +3302,16 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 3; break; } + /* funlinkat */ + case 568: { + struct funlinkat_args *p = params; + iarg[0] = p->dfd; /* int */ + uarg[1] = (intptr_t) p->path; /* const char * */ + iarg[2] = p->fd; /* int */ + iarg[3] = p->flag; /* int */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -8810,6 +8820,25 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; + /* funlinkat */ + case 568: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -10703,6 +10732,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* fhreadlink */ case 567: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* funlinkat */ + case 568: if (ndx == 0 || ndx == 1) p = "int"; break; Modified: head/sys/sys/syscall.h ============================================================================== --- head/sys/sys/syscall.h Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/sys/syscall.h Sat Apr 6 09:37:10 2019 (r345983) @@ -503,4 +503,5 @@ #define SYS_fhlink 565 #define SYS_fhlinkat 566 #define SYS_fhreadlink 567 -#define SYS_MAXSYSCALL 568 +#define SYS_funlinkat 568 +#define SYS_MAXSYSCALL 569 Modified: head/sys/sys/syscall.mk ============================================================================== --- head/sys/sys/syscall.mk Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/sys/syscall.mk Sat Apr 6 09:37:10 2019 (r345983) @@ -408,4 +408,5 @@ MIASM = \ getfhat.o \ fhlink.o \ fhlinkat.o \ - fhreadlink.o + fhreadlink.o \ + funlinkat.o Modified: head/sys/sys/sysproto.h ============================================================================== --- head/sys/sys/sysproto.h Sat Apr 6 09:34:26 2019 (r345982) +++ head/sys/sys/sysproto.h Sat Apr 6 09:37:10 2019 (r345983) @@ -1790,6 +1790,12 @@ struct fhreadlink_args { char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)]; }; +struct funlinkat_args { + char dfd_l_[PADL_(int)]; int dfd; char dfd_r_[PADR_(int)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2174,6 +2180,7 @@ int sys_getfhat(struct thread *, struct getfhat_args * int sys_fhlink(struct thread *, struct fhlink_args *); int sys_fhlinkat(struct thread *, struct fhlinkat_args *); int sys_fhreadlink(struct thread *, struct fhreadlink_args *); +int sys_funlinkat(struct thread *, struct funlinkat_args *); #ifdef COMPAT_43 @@ -3080,6 +3087,7 @@ int freebsd11_mknodat(struct thread *, struct freebsd1 #define SYS_AUE_fhlink AUE_NULL #define SYS_AUE_fhlinkat AUE_NULL #define SYS_AUE_fhreadlink AUE_NULL +#define SYS_AUE_funlinkat AUE_UNLINKAT #undef PAD_ #undef PADL_