diff options
author | Brian Behlendorf <[email protected]> | 2011-01-06 16:49:45 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2011-02-10 09:21:43 -0800 |
commit | 4e1b54fdde35e952ea7084a4640e08c6e42f8a94 (patch) | |
tree | d68ca5a39f297b14752346dd2a33a3d96b232dbe /module/zfs | |
parent | 9ee7fac5312f9c6b33155aed77e50b0dfd68a77d (diff) |
Remove zfs_parse_bootfs() support
Remove unneeded bootfs functions. This support shouldn't be required
for the Linux port, and even if it is it would need to be reworked
to integrate cleanly with Linux.
Diffstat (limited to 'module/zfs')
-rw-r--r-- | module/zfs/zfs_vfsops.c | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index a97d0bdb7..ef433125a 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -1245,61 +1245,6 @@ zfs_unregister_callbacks(zfsvfs_t *zfsvfs) } EXPORT_SYMBOL(zfs_unregister_callbacks); -/* - * Convert a decimal digit string to a uint64_t integer. - */ -static int -str_to_uint64(char *str, uint64_t *objnum) -{ - uint64_t num = 0; - - while (*str) { - if (*str < '0' || *str > '9') - return (EINVAL); - - num = num*10 + *str++ - '0'; - } - - *objnum = num; - return (0); -} - -/* - * The boot path passed from the boot loader is in the form of - * "rootpool-name/root-filesystem-object-number'. Convert this - * string to a dataset name: "rootpool-name/root-filesystem-name". - */ -static int -zfs_parse_bootfs(char *bpath, char *outpath) -{ - char *slashp; - uint64_t objnum; - int error; - - if (*bpath == 0 || *bpath == '/') - return (EINVAL); - - (void) strcpy(outpath, bpath); - - slashp = strchr(bpath, '/'); - - /* if no '/', just return the pool name */ - if (slashp == NULL) { - return (0); - } - - /* if not a number, just return the root dataset name */ - if (str_to_uint64(slashp+1, &objnum)) { - return (0); - } - - *slashp = '\0'; - error = dsl_dsobj_to_dsname(bpath, objnum, outpath); - *slashp = '/'; - - return (error); -} - #ifdef HAVE_MLSLABEL /* * zfs_check_global_label: |