Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-03-16 11:24:12 -07:00
parent a278d2bed4 af0afd9ce3
commit 1eff783f19
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/zfs_main.c
View File

@ -2899,6 +2899,7 @@ typedef struct get_all_cbdata {
#define SPINNER_TIME 3 /* seconds */ #define SPINNER_TIME 3 /* seconds */
#define MOUNT_TIME 5 /* seconds */ #define MOUNT_TIME 5 /* seconds */
#ifdef HAVE_ZPL
static int static int
get_one_dataset(zfs_handle_t *zhp, void *data) get_one_dataset(zfs_handle_t *zhp, void *data)
{ {
@ -2962,7 +2963,6 @@ get_one_dataset(zfs_handle_t *zhp, void *data)
return (0); return (0);
} }
#ifdef HAVE_ZPL
static void static void
get_all_datasets(uint_t types, zfs_handle_t ***dslist, size_t *count, get_all_datasets(uint_t types, zfs_handle_t ***dslist, size_t *count,
boolean_t verbose) boolean_t verbose)