c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

libshare/nfs: destaticify nfs_lock_fd

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13165
This commit is contained in:
наб 2022-02-28 12:57:47 +01:00 committed by Brian Behlendorf
parent ee668b8331
commit 566e4a58b7
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/libshare/nfs.c
View File

@ -30,33 +30,30 @@
#include "nfs.h" #include "nfs.h"
static int nfs_lock_fd = -1;
/* /*
* nfs_exports_[lock|unlock] are used to guard against conconcurrent * nfs_exports_[lock|unlock] are used to guard against conconcurrent
* updates to the exports file. Each protocol is responsible for * updates to the exports file. Each protocol is responsible for
* providing the necessary locking to ensure consistency. * providing the necessary locking to ensure consistency.
*/ */
static int static int
nfs_exports_lock(const char *name) nfs_exports_lock(const char *name, int *nfs_lock_fd)
{ {
int err; int err;
nfs_lock_fd = open(name, O_RDWR | O_CREAT | O_CLOEXEC, 0600); *nfs_lock_fd = open(name, O_RDWR | O_CREAT | O_CLOEXEC, 0600);
if (nfs_lock_fd == -1) { if (*nfs_lock_fd == -1) {
err = errno; err = errno;
fprintf(stderr, "failed to lock %s: %s\n", name, strerror(err)); fprintf(stderr, "failed to lock %s: %s\n", name, strerror(err));
return (err); return (err);
} }
while ((err = flock(nfs_lock_fd, LOCK_EX)) != 0 && errno == EINTR) while ((err = flock(*nfs_lock_fd, LOCK_EX)) != 0 && errno == EINTR)
; ;
if (err != 0) { if (err != 0) {
err = errno; err = errno;
fprintf(stderr, "failed to lock %s: %s\n", name, strerror(err)); fprintf(stderr, "failed to lock %s: %s\n", name, strerror(err));
(void) close(nfs_lock_fd); (void) close(*nfs_lock_fd);
nfs_lock_fd = -1; *nfs_lock_fd = -1;
return (err); return (err);
} }
@ -64,17 +61,16 @@ nfs_exports_lock(const char *name)
} }
static void static void
nfs_exports_unlock(const char *name) nfs_exports_unlock(const char *name, int *nfs_lock_fd)
{ {
verify(nfs_lock_fd > 0); verify(*nfs_lock_fd > 0);
if (flock(nfs_lock_fd, LOCK_UN) != 0) { if (flock(*nfs_lock_fd, LOCK_UN) != 0)
fprintf(stderr, "failed to unlock %s: %s\n", fprintf(stderr, "failed to unlock %s: %s\n",
name, strerror(errno)); name, strerror(errno));
}
(void) close(nfs_lock_fd); (void) close(*nfs_lock_fd);
nfs_lock_fd = -1; *nfs_lock_fd = -1;
} }
struct tmpfile { struct tmpfile {
@ -216,13 +212,13 @@ nfs_toggle_share(const char *lockfile, const char *exports,
const char *expdir, sa_share_impl_t impl_share, const char *expdir, sa_share_impl_t impl_share,
int(*cbk)(sa_share_impl_t impl_share, FILE *tmpfile)) int(*cbk)(sa_share_impl_t impl_share, FILE *tmpfile))
{ {
int error; int error, nfs_lock_fd = -1;
struct tmpfile tmpf; struct tmpfile tmpf;
if (!nfs_init_tmpfile(exports, expdir, &tmpf)) if (!nfs_init_tmpfile(exports, expdir, &tmpf))
return (SA_SYSTEM_ERR); return (SA_SYSTEM_ERR);
error = nfs_exports_lock(lockfile); error = nfs_exports_lock(lockfile, &nfs_lock_fd);
if (error != 0) { if (error != 0) {
nfs_abort_tmpfile(&tmpf); nfs_abort_tmpfile(&tmpf);
return (error); return (error);
@ -237,12 +233,12 @@ nfs_toggle_share(const char *lockfile, const char *exports,
goto fullerr; goto fullerr;
error = nfs_fini_tmpfile(exports, &tmpf); error = nfs_fini_tmpfile(exports, &tmpf);
nfs_exports_unlock(lockfile); nfs_exports_unlock(lockfile, &nfs_lock_fd);
return (error); return (error);
fullerr: fullerr:
nfs_abort_tmpfile(&tmpf); nfs_abort_tmpfile(&tmpf);
nfs_exports_unlock(lockfile); nfs_exports_unlock(lockfile, &nfs_lock_fd);
return (error); return (error);
} }