[PATCH] io: Mark lockf() __wur [BZ #32800]

Florian Weimer fweimer@redhat.com
Sat Jun 14 09:56:58 GMT 2025


* Radko Krkoš:

> In commit 0476597b28 flock() was marked __wur in posix/unistd.h, but not
> in io/fcntl.h, the declarations must match.

I'm going to accept this as a non-legally significant contribution under
the FSF guidelines, so copyright assignment is not needed.

> diff --git a/io/fcntl.h b/io/fcntl.h
> index 59dc7d4c51..132d83a371 100644
> --- a/io/fcntl.h
> +++ b/io/fcntl.h
> @@ -281,16 +281,17 @@ extern int creat64 (const char *__file, mode_t 
> __mode) __nonnull ((1));
>   # define F_TEST  3	/* Test a region for other processes locks.  */
>
>   # ifndef __USE_FILE_OFFSET64
> -extern int lockf (int __fd, int __cmd, off_t __len);
> +extern int lockf (int __fd, int __cmd, off_t __len) __wur;
>   # else
>   #  ifdef __REDIRECT
> -extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len), 
> lockf64);
> +extern int __REDIRECT (lockf, (int __fd, int __cmd, __off64_t __len),
> +                       lockf64) __wur;
>   #  else
>   #   define lockf lockf64
>   #  endif
>   # endif
>   # ifdef __USE_LARGEFILE64
> -extern int lockf64 (int __fd, int __cmd, off64_t __len);
> +extern int lockf64 (int __fd, int __cmd, off64_t __len) __wur;
>   # endif
>   #endif

I checked that this covers all the remaining cases.  Tested on
powerpc64le-linux-gnu.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Thanks,
Florian



More information about the Libc-alpha mailing list