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-11 22:50:39 -07:00
parent b3dbc77669 df86f94c91
commit f5f96969ab
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zfs/zfs_main.c
View File

@ -817,7 +817,9 @@ out:
static int static int
destroy_callback(zfs_handle_t *zhp, void *data) destroy_callback(zfs_handle_t *zhp, void *data)
{ {
#ifdef HAVE_ZPL
destroy_cbdata_t *cbp = data; destroy_cbdata_t *cbp = data;
#endif
/* /*
* Ignore pools (which we've already flagged as an error before getting * Ignore pools (which we've already flagged as an error before getting
@ -4152,7 +4154,9 @@ main(int argc, char **argv)
{ {
int ret; int ret;
int i; int i;
#ifdef HAVE_ZPL
char *progname; char *progname;
#endif
char *cmdname; char *cmdname;
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");

2
cmd/zpool/zpool_main.c
View File

@ -697,7 +697,9 @@ zpool_do_create(int argc, char **argv)
(strcmp(mountpoint, ZFS_MOUNTPOINT_LEGACY) != 0 && (strcmp(mountpoint, ZFS_MOUNTPOINT_LEGACY) != 0 &&
strcmp(mountpoint, ZFS_MOUNTPOINT_NONE) != 0)) { strcmp(mountpoint, ZFS_MOUNTPOINT_NONE) != 0)) {
char buf[MAXPATHLEN]; char buf[MAXPATHLEN];
#ifdef HAVE_ZPL
DIR *dirp; DIR *dirp;
#endif
if (mountpoint && mountpoint[0] != '/') { if (mountpoint && mountpoint[0] != '/') {
(void) fprintf(stderr, gettext("invalid mountpoint " (void) fprintf(stderr, gettext("invalid mountpoint "

8
module/zfs/zfs_ioctl.c
View File

@ -616,6 +616,7 @@ zfs_secpolicy_create(zfs_cmd_t *zc, cred_t *cr)
return (error); return (error);
} }
#ifdef HAVE_ZPL
static int static int
zfs_secpolicy_umount(zfs_cmd_t *zc, cred_t *cr) zfs_secpolicy_umount(zfs_cmd_t *zc, cred_t *cr)
{ {
@ -627,6 +628,7 @@ zfs_secpolicy_umount(zfs_cmd_t *zc, cred_t *cr)
} }
return (error); return (error);
} }
#endif /* HAVE_ZPL */
/* /*
* Policy for pool operations - create/destroy pools, add vdevs, etc. Requires * Policy for pool operations - create/destroy pools, add vdevs, etc. Requires
@ -1883,6 +1885,7 @@ zfs_ioc_remove_minor(zfs_cmd_t *zc)
#endif /* HAVE_ZVOL */ #endif /* HAVE_ZVOL */
} }
#ifdef HAVE_ZPL
/* /*
* Search the vfs list for a specified resource. Returns a pointer to it * Search the vfs list for a specified resource. Returns a pointer to it
* or NULL if no suitable entry is found. The caller of this routine * or NULL if no suitable entry is found. The caller of this routine
@ -1891,7 +1894,6 @@ zfs_ioc_remove_minor(zfs_cmd_t *zc)
static vfs_t * static vfs_t *
zfs_get_vfs(const char *resource) zfs_get_vfs(const char *resource)
{ {
#ifdef HAVE_ZPL
struct vfs *vfsp; struct vfs *vfsp;
struct vfs *vfs_found = NULL; struct vfs *vfs_found = NULL;
@ -1907,10 +1909,8 @@ zfs_get_vfs(const char *resource)
} while (vfsp != rootvfs); } while (vfsp != rootvfs);
vfs_list_unlock(); vfs_list_unlock();
return (vfs_found); return (vfs_found);
#else
return NULL;
#endif /* HAVE_ZPL */
} }
#endif /* HAVE_ZPL */
/* ARGSUSED */ /* ARGSUSED */
static void static void

3
module/zfs/zio.c
View File

@ -1434,10 +1434,9 @@ zio_gang_tree_assemble_done(zio_t *zio)
zio_t *lio = zio->io_logical; zio_t *lio = zio->io_logical;
zio_gang_node_t *gn = zio->io_private; zio_gang_node_t *gn = zio->io_private;
blkptr_t *bp = zio->io_bp; blkptr_t *bp = zio->io_bp;
zio_t *pio = zio_unique_parent(zio);
int g; int g;
ASSERT(pio == lio); ASSERT(zio_unique_parent(zio) == lio);
ASSERT(zio_walk_children(zio) == NULL); ASSERT(zio_walk_children(zio) == NULL);
if (zio->io_error) if (zio->io_error)