public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Florian Weimer <fweimer@redhat.com>
To: Xi Ruoyao <xry111@xry111.site>
Cc: libc-alpha@sourceware.org,
	 Adhemerval Zanella <adhemerval.zanella@linaro.org>,
	 Joseph Myers <josmyers@redhat.com>,
	Miao Wang <shankerwangmiao@gmail.com>
Subject: Re: [PATCH] io: statx, fstatat: Drop nonnull attribute on the path argument
Date: Mon, 23 Dec 2024 10:31:44 +0100	[thread overview]
Message-ID: <875xnapwxr.fsf@oldenburg.str.redhat.com> (raw)
In-Reply-To: <874j2zy7al.fsf@oldenburg.str.redhat.com> (Florian Weimer's message of "Thu, 19 Dec 2024 17:19:30 +0100")

* Florian Weimer:

> * Xi Ruoyao:
>
>> From: Miao Wang <shankerwangmiao@gmail.com>
>>
>> Since Linux 6.11 the kernel allows path to be NULL if flags &
>> AT_EMPTY_PATH.  Let's allow users to take the advantage if they don't
>> care running on old kernels.
>>
>> [ xry111: separate the obvious change from the controversial
>>   "io: statx, fstatat64: allow using NULL as path" patch ]
>>
>> Signed-off-by: Miao Wang <shankerwangmiao@gmail.com>
>> Signed-off-by: Xi Ruoyao <xry111@xry111.site>
>> ---
>>  io/bits/statx-generic.h |  2 +-
>>  io/sys/stat.h           | 10 +++++-----
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/io/bits/statx-generic.h b/io/bits/statx-generic.h
>> index 19c3565edc..c0e00c9d8b 100644
>> --- a/io/bits/statx-generic.h
>> +++ b/io/bits/statx-generic.h
>> @@ -62,6 +62,6 @@ __BEGIN_DECLS
>>  /* Fill *BUF with information about PATH in DIRFD.  */
>>  int statx (int __dirfd, const char *__restrict __path, int __flags,
>>             unsigned int __mask, struct statx *__restrict __buf)
>> -  __THROW __nonnull ((2, 5));
>> +  __THROW __nonnull ((5));
>>  
>>  __END_DECLS
>> diff --git a/io/sys/stat.h b/io/sys/stat.h
>> index 3b4ba80132..7ea39b8755 100644
>> --- a/io/sys/stat.h
>> +++ b/io/sys/stat.h
>> @@ -263,14 +263,14 @@ extern int __REDIRECT_NTH (fstat64, (int __fd, struct stat64 *__buf),
>>  # ifndef __USE_FILE_OFFSET64
>>  extern int fstatat (int __fd, const char *__restrict __file,
>>  		    struct stat *__restrict __buf, int __flag)
>> -     __THROW __nonnull ((2, 3));
>> +     __THROW __nonnull ((3));
>>  # else
>>  #  ifdef __USE_TIME64_REDIRECTS
>>  #   ifdef __REDIRECT_NTH
>>  extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,
>>  				     struct stat *__restrict __buf,
>>  				     int __flag),
>> -			   __fstatat64_time64) __nonnull ((2, 3));
>> +			   __fstatat64_time64) __nonnull ((3));
>>  #   else
>>  #    define fstatat __fstatat64_time64
>>  #   endif
>> @@ -279,7 +279,7 @@ extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,
>>  extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,
>>  				     struct stat *__restrict __buf,
>>  				     int __flag),
>> -			   fstatat64) __nonnull ((2, 3));
>> +			   fstatat64) __nonnull ((3));
>>  #   else
>>  #    define fstatat fstatat64
>>  #   endif
>> @@ -290,7 +290,7 @@ extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,
>>  #  ifndef __USE_TIME64_REDIRECTS
>>  extern int fstatat64 (int __fd, const char *__restrict __file,
>>  		      struct stat64 *__restrict __buf, int __flag)
>> -     __THROW __nonnull ((2, 3));
>> +     __THROW __nonnull ((3));
>>  #  else
>>  #   ifdef __REDIRECT_NTH
>>  extern int __REDIRECT_NTH (fstatat64, (int __fd,
>> @@ -298,7 +298,7 @@ extern int __REDIRECT_NTH (fstatat64, (int __fd,
>>  				       struct stat64 *__restrict __buf,
>>  				       int __flag),
>>  			   __fstatat64_time64)
>> -     __nonnull ((2, 3));
>> +     __nonnull ((3));
>>  #   else
>>  #    define fstatat64 __fstatat64_time64
>>  #   endif
>
> This looks good to me.
>
> Reviewed-by: Florian Weimer <fweimer@redhat.com>
>
> Any objections to pushing this?

Hearing no objections, I've pushed this.

Thanks,
Florian


      reply	other threads:[~2024-12-23  9:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-03 18:51 Xi Ruoyao
2024-12-19 16:19 ` Florian Weimer
2024-12-23  9:31   ` Florian Weimer [this message]

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=875xnapwxr.fsf@oldenburg.str.redhat.com \
    --to=fweimer@redhat.com \
    --cc=adhemerval.zanella@linaro.org \
    --cc=josmyers@redhat.com \
    --cc=libc-alpha@sourceware.org \
    --cc=shankerwangmiao@gmail.com \
    --cc=xry111@xry111.site \
    /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).