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 2010-05-20 10:29:53 -07:00
parent 4e17ee1040 7b86766ab9
commit ed4299321e
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/user-libuuid.m4
View File

@ -5,13 +5,13 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBUUID], [
LIBUUID= LIBUUID=
AC_CHECK_HEADER([uuid/uuid.h], [], [AC_MSG_FAILURE([ AC_CHECK_HEADER([uuid/uuid.h], [], [AC_MSG_FAILURE([
*** uuid/uuid.h missing, e2fsprogs-devel package required])]) *** uuid/uuid.h missing, libuuid-devel package required])])
AC_CHECK_LIB([uuid], [uuid_generate], [], [AC_MSG_FAILURE([ AC_CHECK_LIB([uuid], [uuid_generate], [], [AC_MSG_FAILURE([
*** uuid_generate() missing, e2fsprogs-devel package required])]) *** uuid_generate() missing, libuuid-devel package required])])
AC_CHECK_LIB([uuid], [uuid_is_null], [], [AC_MSG_FAILURE([ AC_CHECK_LIB([uuid], [uuid_is_null], [], [AC_MSG_FAILURE([
*** uuid_is_null() missing, e2fsprogs-devel package required])]) *** uuid_is_null() missing, libuuid-devel package required])])
AC_SUBST([LIBUUID], ["-luuid"]) AC_SUBST([LIBUUID], ["-luuid"])
AC_DEFINE([HAVE_LIBUUID], 1, [Define if you have libuuid]) AC_DEFINE([HAVE_LIBUUID], 1, [Define if you have libuuid])

1
lib/libzfs/libzfs_pool.c
View File

@ -37,6 +37,7 @@
#include <strings.h> #include <strings.h>
#include <unistd.h> #include <unistd.h>
#include <zone.h> #include <zone.h>
#include <sys/stat.h>
#include <sys/efi_partition.h> #include <sys/efi_partition.h>
#include <sys/vtoc.h> #include <sys/vtoc.h>
#include <sys/zfs_ioctl.h> #include <sys/zfs_ioctl.h>

1
lib/libzfs/libzfs_util.c
View File

@ -37,6 +37,7 @@
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <sys/stat.h>
#include <sys/mnttab.h> #include <sys/mnttab.h>
#include <sys/mntent.h> #include <sys/mntent.h>
#include <sys/types.h> #include <sys/types.h>

4
module/zfs/spa.c
View File

@ -3919,7 +3919,7 @@ spa_sync_nvlist(spa_t *spa, uint64_t obj, nvlist_t *nv, dmu_tx_t *tx)
* saves us a pre-read to get data we don't actually care about. * saves us a pre-read to get data we don't actually care about.
*/ */
bufsize = P2ROUNDUP(nvsize, SPA_CONFIG_BLOCKSIZE); bufsize = P2ROUNDUP(nvsize, SPA_CONFIG_BLOCKSIZE);
packed = kmem_alloc(bufsize, KM_SLEEP); packed = vmem_alloc(bufsize, KM_SLEEP);
VERIFY(nvlist_pack(nv, &packed, &nvsize, NV_ENCODE_XDR, VERIFY(nvlist_pack(nv, &packed, &nvsize, NV_ENCODE_XDR,
KM_SLEEP) == 0); KM_SLEEP) == 0);
@ -3927,7 +3927,7 @@ spa_sync_nvlist(spa_t *spa, uint64_t obj, nvlist_t *nv, dmu_tx_t *tx)
dmu_write(spa->spa_meta_objset, obj, 0, bufsize, packed, tx); dmu_write(spa->spa_meta_objset, obj, 0, bufsize, packed, tx);
kmem_free(packed, bufsize); vmem_free(packed, bufsize);
VERIFY(0 == dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db)); VERIFY(0 == dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db));
dmu_buf_will_dirty(db, tx); dmu_buf_will_dirty(db, tx);