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

Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module

This commit is contained in:
Brian Behlendorf 2009-03-16 16:20:02 -07:00
parent 6bd672012f df985d53db
commit 5edabb999f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzfs/libzfs_dataset.c
View File

@ -3789,7 +3789,7 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force)
zfs_cmd_t zc = { "\0", "\0", "\0", 0 }; zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
boolean_t restore_resv = 0; boolean_t restore_resv = 0;
uint64_t old_volsize = 0, new_volsize; uint64_t old_volsize = 0, new_volsize;
zfs_prop_t resv_prop; zfs_prop_t resv_prop = { 0 };
assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM || assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
zhp->zfs_type == ZFS_TYPE_VOLUME); zhp->zfs_type == ZFS_TYPE_VOLUME);

2
module/zfs/spa_misc.c
View File

@ -395,7 +395,7 @@ spa_lookup(const char *name)
static spa_t search; /* spa_t is large; don't allocate on stack */ static spa_t search; /* spa_t is large; don't allocate on stack */
spa_t *spa; spa_t *spa;
avl_index_t where; avl_index_t where;
char c; char c = 0;
char *cp; char *cp;
ASSERT(MUTEX_HELD(&spa_namespace_lock)); ASSERT(MUTEX_HELD(&spa_namespace_lock));

2
module/zfs/vdev_label.c
View File

@ -497,7 +497,7 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason)
char *buf; char *buf;
size_t buflen; size_t buflen;
int error; int error;
uint64_t spare_guid, l2cache_guid; uint64_t spare_guid = 0, l2cache_guid;
int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL; int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL;
int c, l, n; int c, l, n;