Skip to content

Commit

Permalink
Use /sys/module instead of /proc/modules.
Browse files Browse the repository at this point in the history
When libzfs checks if the module is loaded or not, it currently reads
/proc/modules and searches for a line matching the module name.

Unfortunately, if the module is included in the kernel itself (built-in
module), then /proc/modules won't list it, so libzfs will wrongly conclude
that the module is not loaded, thus making all ZFS userspace tools unusable.

Fortunately, all loaded modules appear as directories in /sys/module, even
built-in ones. Thus we can use /sys/module in lieu of /proc/modules to fix
the issue.

As a bonus, the code for checking becomes much simpler.

Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#851
  • Loading branch information
dechamps authored and behlendorf committed Jul 26, 2012
1 parent 2ee4a18 commit f09398c
Showing 1 changed file with 5 additions and 19 deletions.
24 changes: 5 additions & 19 deletions lib/libzfs/libzfs_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,27 +608,13 @@ libzfs_print_on_error(libzfs_handle_t *hdl, boolean_t printerr)
static int
libzfs_module_loaded(const char *module)
{
FILE *f;
int result = 0;
char name[256];
const char path_prefix[] = "/sys/module/";
char path[256];

f = fopen("/proc/modules", "r");
if (f == NULL)
return -1;
memcpy(path, path_prefix, sizeof(path_prefix) - 1);
strcpy(path + sizeof(path_prefix) - 1, module);

while (fgets(name, sizeof(name), f)) {
char *c = strchr(name, ' ');
if (!c)
continue;
*c = 0;
if (strcmp(module, name) == 0) {
result = 1;
break;
}
}
fclose(f);

return result;
return (access(path, F_OK) == 0);
}

int
Expand Down

0 comments on commit f09398c

Please sign in to comment.