splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvmutil: rename lseek_loop to lseek_on_eintr

Browse Source 
that's what it does!

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-19 07:48:53 +00:00
parent 1fbe972fa7
commit 4b35d9ac29
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/nvmutil/include/common.h
View File

@@ -404,7 +404,7 @@ int check_file(int fd, struct stat *st);
long rw_over_nrw(long r, unsigned long nrw); long rw_over_nrw(long r, unsigned long nrw);
#if !defined(HAVE_REAL_PREAD_PWRITE) || \ #if !defined(HAVE_REAL_PREAD_PWRITE) || \
HAVE_REAL_PREAD_PWRITE < 1 HAVE_REAL_PREAD_PWRITE < 1
off_t lseek_loop(int fd, off_t off, off_t lseek_on_eintr(int fd, off_t off,
int whence, int loop_eagain, int loop_eintr); int whence, int loop_eagain, int loop_eintr);
#endif #endif
int try_err(int loop_err, int errval); int try_err(int loop_err, int errval);

16
util/nvmutil/lib/file.c
View File

@@ -673,14 +673,14 @@ real_pread_pwrite:
HAVE_REAL_PREAD_PWRITE > 0 HAVE_REAL_PREAD_PWRITE > 0
goto real_pread_pwrite; goto real_pread_pwrite;
#else #else
if ((off_orig = lseek_loop(fd, (off_t)0, SEEK_CUR, if ((off_orig = lseek_on_eintr(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr)) == (off_t)-1) { loop_eagain, loop_eintr)) == (off_t)-1) {
r = -1; r = -1;
} else if (lseek_loop(fd, off, SEEK_SET, } else if (lseek_on_eintr(fd, off, SEEK_SET,
loop_eagain, loop_eintr) == (off_t)-1) { loop_eagain, loop_eintr) == (off_t)-1) {
r = -1; r = -1;
} else { } else {
verified = lseek_loop(fd, (off_t)0, SEEK_CUR, verified = lseek_on_eintr(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
/* /*
@@ -695,7 +695,7 @@ real_pread_pwrite:
* that nothing is touching it now. * that nothing is touching it now.
*/ */
if (off_reset && off != verified) if (off_reset && off != verified)
lseek_loop(fd, off, SEEK_SET, lseek_on_eintr(fd, off, SEEK_SET,
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
do { do {
@@ -716,7 +716,7 @@ real_pread_pwrite:
* will cause an exit, including * will cause an exit, including
* per EINTR/EAGAIN re-spin. * per EINTR/EAGAIN re-spin.
*/ */
verified = lseek_loop(fd, (off_t)0, SEEK_CUR, verified = lseek_on_eintr(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
if (off != verified) if (off != verified)
@@ -739,7 +739,7 @@ real_pread_pwrite:
saved_errno = errno; saved_errno = errno;
off_last = lseek_loop(fd, off_orig, SEEK_SET, off_last = lseek_on_eintr(fd, off_orig, SEEK_SET,
loop_eagain, loop_eintr); loop_eagain, loop_eintr);
if (off_last != off_orig) { if (off_last != off_orig) {
@@ -869,12 +869,12 @@ err_rw_over_nrw:
#if !defined(HAVE_REAL_PREAD_PWRITE) || \ #if !defined(HAVE_REAL_PREAD_PWRITE) || \
HAVE_REAL_PREAD_PWRITE < 1 HAVE_REAL_PREAD_PWRITE < 1
/* /*
* lseek_loop() does lseek() but optionally * lseek_on_eintr() does lseek() but optionally
* on an EINTR/EAGAIN wait loop. Used by prw() * on an EINTR/EAGAIN wait loop. Used by prw()
* for setting offsets for positional I/O. * for setting offsets for positional I/O.
*/ */
off_t off_t
lseek_loop(int fd, off_t off, int whence, lseek_on_eintr(int fd, off_t off, int whence,
int loop_eagain, int loop_eintr) int loop_eagain, int loop_eintr)
{ {
off_t old; off_t old;