Date: Tue, 18 Jul 2023 21:44:59 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 772946778167 - main - linux(4): Use M_LINUX for malloc type in getdents Message-ID: <202307182144.36ILix3M061894@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7729467781670a84059d50c4726dc94cbf4500e9 commit 7729467781670a84059d50c4726dc94cbf4500e9 Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2023-07-18 21:44:16 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2023-07-18 21:44:16 +0000 linux(4): Use M_LINUX for malloc type in getdents MFC after: 2 weeks --- sys/compat/linux/linux_file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 0538fdd12b73..33b357f222b2 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -413,7 +413,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) size_t retval; buflen = min(args->count, MAXBSIZE); - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = malloc(buflen, M_LINUX, M_WAITOK); error = kern_getdirentries(td, args->fd, buf, buflen, &base, NULL, UIO_SYSSPACE); @@ -422,7 +422,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) goto out1; } - lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_TEMP, M_WAITOK | M_ZERO); + lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO); len = td->td_retval[0]; inp = buf; @@ -468,9 +468,9 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) td->td_retval[0] = retval; out: - free(lbuf, M_TEMP); + free(lbuf, M_LINUX); out1: - free(buf, M_TEMP); + free(buf, M_LINUX); return (error); } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307182144.36ILix3M061894>