From: Yury Norov <ynorov@caviumnetworks.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: <libc-alpha@sourceware.org>
Subject: Re: [PATCH 4/4] Consolidate Linux truncate implementations
Date: Thu, 22 Sep 2016 14:25:00 -0000 [thread overview]
Message-ID: <20160922142442.GA5914@yury-N73SV> (raw)
In-Reply-To: <1474383714-15187-5-git-send-email-adhemerval.zanella@linaro.org>
On Tue, Sep 20, 2016 at 12:01:54PM -0300, Adhemerval Zanella wrote:
> diff --git a/sysdeps/unix/sysv/linux/truncate.c b/sysdeps/unix/sysv/linux/truncate.c
> new file mode 100644
> index 0000000..9e71288
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/truncate.c
> @@ -0,0 +1,35 @@
> +/* Copyright (C) 2016 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library. If not, see
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <unistd.h>
> +#include <sysdep.h>
> +#include <errno.h>
> +
> +#ifndef __OFF_T_MATCHES_OFF64_T
> +/* Truncate PATH to LENGTH bytes. */
> +int
> +__truncate (const char *path, off_t length)
> +{
> +# ifndef __NR_truncate
> + return INLINE_SYSCALL_CALL (truncate64, path,
> + __ALIGNMENT_ARG SYSCALL_LL (length));
> +# else
> + return INLINE_SYSCALL_CALL (truncate, path, length);
> +# endif
> +}
> +weak_alias (__truncate, truncate)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c
> index 92a6bc4..0d70da7 100644
> --- a/sysdeps/unix/sysv/linux/truncate64.c
> +++ b/sysdeps/unix/sysv/linux/truncate64.c
> @@ -15,21 +15,23 @@
> License along with the GNU C Library; if not, see
> <http://www.gnu.org/licenses/>. */
>
> -#include <sys/types.h>
> -#include <endian.h>
> -#include <errno.h>
> #include <unistd.h>
> -
> #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <errno.h>
>
> -/* Truncate the file referenced by FD to LENGTH bytes. */
> +#ifndef __NR_truncate64
> +# define __NR_truncate64 __NR_truncate
> +#endif
> +
> +/* Truncate PATH to LENGTH bytes. */
> int
> -truncate64 (const char *path, off64_t length)
> +__truncate64 (const char *path, off64_t length)
> {
> - unsigned int low = length & 0xffffffff;
> - unsigned int high = length >> 32;
> - int result = INLINE_SYSCALL (truncate64, 3, path,
> - __LONG_LONG_PAIR (high, low));
> - return result;
> + return INLINE_SYSCALL_CALL (truncate64, path,
> + __ALIGNMENT_ARG SYSCALL_LL64 (length));
> }
> +weak_alias (__truncate64, truncate64)
> +
> +#ifdef __OFF_T_MATCHES_OFF64_T
> +weak_alias (__truncate64, truncate);
> +#endif
It seems you forgot weak_alias (__truncate64, __truncate);
next prev parent reply other threads:[~2016-09-22 14:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 15:02 [PATCH 0/4] Linux lseek and {f}truncate syscall consolidation Adhemerval Zanella
2016-09-20 15:02 ` [PATCH 1/4] Add INTERNAL_SYSCALL_CALL Adhemerval Zanella
2016-09-20 21:36 ` Florian Weimer
2016-09-21 18:00 ` Adhemerval Zanella
2016-09-21 19:22 ` Florian Weimer
2016-09-22 13:43 ` Adhemerval Zanella
2016-09-22 20:34 ` Florian Weimer
2016-09-23 14:16 ` Adhemerval Zanella
2016-09-23 20:39 ` Florian Weimer
2016-09-20 15:02 ` [PATCH v3 2/4] Consolidate lseek/lseek64/llseek implementations Adhemerval Zanella
2016-10-11 14:40 ` Adhemerval Zanella
2016-10-25 17:54 ` Adhemerval Zanella
2016-11-04 16:23 ` Adhemerval Zanella
2016-11-08 19:02 ` Steve Ellcey
2016-09-20 15:02 ` [PATCH 4/4] Consolidate Linux truncate implementations Adhemerval Zanella
2016-09-22 14:25 ` Yury Norov [this message]
2016-09-22 14:42 ` Adhemerval Zanella
2016-09-22 15:52 ` Yury Norov
2016-09-22 19:05 ` Adhemerval Zanella
2016-10-25 17:55 ` Adhemerval Zanella
2016-11-09 13:44 ` Adhemerval Zanella
2016-09-20 15:02 ` [PATCH 3/4] Consolidate Linux ftruncate implementations Adhemerval Zanella
2016-10-11 14:41 ` Adhemerval Zanella
2016-10-25 17:54 ` Adhemerval Zanella
2016-11-09 13:44 ` Adhemerval Zanella
2016-11-09 15:33 ` Andreas Schwab
2016-11-09 17:24 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160922142442.GA5914@yury-N73SV \
--to=ynorov@caviumnetworks.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).