diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-01-10 09:42:00 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2023-01-10 09:48:36 -0500 |
| commit | 2c0b524983925ebd6b8ab8b7952fba2aea41c94d (patch) | |
| tree | f1bd90fabd8cb15816fd87a67fa3ce16e1d467a9 /support/misc | |
| parent | cdbef4e97a1cbc68cbaf16ba57d71858d2c69973 (diff) | |
| download | nfs-utils-2c0b524983925ebd6b8ab8b7952fba2aea41c94d.tar.gz | |
Replace statfs64 with statfs
autoconf AC_SYS_LARGEFILE is used by configure to add needed defines
when needed for enabling 64bit off_t, therefore replacing statfs64 with
statfs should be functionally same. Additionally this helps compiling
with latest musl where 64bit LFS functions like statfs64 and friends are
now moved under _LARGEFILE64_SOURCE feature test macro, this works on
glibc systems because _GNU_SOURCE macros also enables
_LARGEFILE64_SOURCE indirectly. This is not case with musl and this
latest issue is exposed.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/misc')
| -rw-r--r-- | support/misc/nfsd_path.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c index 65e53c1..c3dea4f 100644 --- a/support/misc/nfsd_path.c +++ b/support/misc/nfsd_path.c @@ -184,46 +184,46 @@ nfsd_path_lstat(const char *pathname, struct stat *statbuf) return nfsd_run_stat(nfsd_wq, nfsd_lstatfunc, pathname, statbuf); } -struct nfsd_statfs64_data { +struct nfsd_statfs_data { const char *pathname; - struct statfs64 *statbuf; + struct statfs *statbuf; int ret; int err; }; static void -nfsd_statfs64func(void *data) +nfsd_statfsfunc(void *data) { - struct nfsd_statfs64_data *d = data; + struct nfsd_statfs_data *d = data; - d->ret = statfs64(d->pathname, d->statbuf); + d->ret = statfs(d->pathname, d->statbuf); if (d->ret < 0) d->err = errno; } static int -nfsd_run_statfs64(struct xthread_workqueue *wq, +nfsd_run_statfs(struct xthread_workqueue *wq, const char *pathname, - struct statfs64 *statbuf) + struct statfs *statbuf) { - struct nfsd_statfs64_data data = { + struct nfsd_statfs_data data = { pathname, statbuf, 0, 0 }; - xthread_work_run_sync(wq, nfsd_statfs64func, &data); + xthread_work_run_sync(wq, nfsd_statfsfunc, &data); if (data.ret < 0) errno = data.err; return data.ret; } int -nfsd_path_statfs64(const char *pathname, struct statfs64 *statbuf) +nfsd_path_statfs(const char *pathname, struct statfs *statbuf) { if (!nfsd_wq) - return statfs64(pathname, statbuf); - return nfsd_run_statfs64(nfsd_wq, pathname, statbuf); + return statfs(pathname, statbuf); + return nfsd_run_statfs(nfsd_wq, pathname, statbuf); } struct nfsd_realpath_data { |