Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A couple of small style cleanups. #12156

Merged
merged 1 commit into from
Jun 3, 2021
Merged

A couple of small style cleanups. #12156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions lib/libzfs/libzfs_pool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4796,19 +4796,24 @@ zpool_load_compat(const char *compat, boolean_t *features, char *report,
* as they're only needed if the filename is relative
* which will be checked during the openat().
*/
#ifndef O_PATH
#define O_PATH O_RDONLY

/* O_PATH safer than O_RDONLY if system allows it */
#if defined(O_PATH)
#define ZC_DIR_FLAGS (O_DIRECTORY | O_CLOEXEC | O_PATH)
#else
#define ZC_DIR_FLAGS (O_DIRECTORY | O_CLOEXEC | O_RDONLY)
#endif
sdirfd = open(ZPOOL_SYSCONF_COMPAT_D, O_DIRECTORY | O_PATH | O_CLOEXEC);
ddirfd = open(ZPOOL_DATA_COMPAT_D, O_DIRECTORY | O_PATH | O_CLOEXEC);

sdirfd = open(ZPOOL_SYSCONF_COMPAT_D, ZC_DIR_FLAGS);
ddirfd = open(ZPOOL_DATA_COMPAT_D, ZC_DIR_FLAGS);

(void) strlcpy(l_compat, compat, ZFS_MAXPROPLEN);

for (file = strtok_r(l_compat, ",", &ps);
file != NULL;
file = strtok_r(NULL, ",", &ps)) {

boolean_t l_features[SPA_FEATURES] = {B_FALSE};
boolean_t l_features[SPA_FEATURES];

enum { Z_SYSCONF, Z_DATA } source;

Expand All @@ -4831,14 +4836,18 @@ zpool_load_compat(const char *compat, boolean_t *features, char *report,
continue;
}

#if !defined(MAP_POPULATE) && defined(MAP_PREFAULT_READ)
#define MAP_POPULATE MAP_PREFAULT_READ
#elif !defined(MAP_POPULATE)
#define MAP_POPULATE 0
/* Prefault the file if system allows */
#if defined(MAP_POPULATE)
#define ZC_MMAP_FLAGS (MAP_PRIVATE | MAP_POPULATE)
#elif defined(MAP_PREFAULT_READ)
#define ZC_MMAP_FLAGS (MAP_PRIVATE | MAP_PREFAULT_READ)
#else
#define ZC_MMAP_FLAGS (MAP_PRIVATE)
#endif

/* private mmap() so we can strtok safely */
fc = (char *)mmap(NULL, fs.st_size,
PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_POPULATE, featfd, 0);
fc = (char *)mmap(NULL, fs.st_size, PROT_READ | PROT_WRITE,
ZC_MMAP_FLAGS, featfd, 0);
(void) close(featfd);

/* map ok, and last character == newline? */
Expand All @@ -4852,7 +4861,10 @@ zpool_load_compat(const char *compat, boolean_t *features, char *report,

ret_nofiles = B_FALSE;

/* replace last char with NUL to ensure we have a delimiter */
for (uint_t i = 0; i < SPA_FEATURES; i++)
l_features[i] = B_FALSE;

/* replace final newline with NULL to ensure string ends */
fc[fs.st_size - 1] = '\0';

for (line = strtok_r(fc, "\n", &ls);
Expand Down