Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
This commit is contained in:
commit
f91ee39124
|
@ -1,6 +1,6 @@
|
|||
DISTFILES = *.c
|
||||
|
||||
MODULE := zpool
|
||||
MODULE := zfs
|
||||
|
||||
EXTRA_CFLAGS = -I@MODDIR@/zfs/include
|
||||
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
|
||||
|
|
|
@ -2189,7 +2189,7 @@ zfs_ioc_snapshot(zfs_cmd_t *zc)
|
|||
if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0)
|
||||
return (EINVAL);
|
||||
|
||||
if (zc->zc_nvlist_src != NULL &&
|
||||
if (zc->zc_nvlist_src != 0 &&
|
||||
(error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
|
||||
&nvprops)) != 0)
|
||||
return (error);
|
||||
|
|
|
@ -22,7 +22,7 @@ zfs_modules=( \
|
|||
${MODDIR}/nvpair/znvpair.ko \
|
||||
${MODDIR}/unicode/zunicode.ko \
|
||||
${MODDIR}/zcommon/zcommon.ko \
|
||||
${MODDIR}/zfs/zpool.ko \
|
||||
${MODDIR}/zfs/zfs.ko \
|
||||
)
|
||||
|
||||
test_modules=( \
|
||||
|
@ -58,8 +58,8 @@ OPTIONS:
|
|||
MODULE-OPTIONS:
|
||||
Must be of the frm module="options", for example:
|
||||
|
||||
$0 zpool="zfs_prefetch_disable=1"
|
||||
$0 zpool="zfs_prefetch_disable=1 zfs_mdcomp_disable=1"
|
||||
$0 zfs="zfs_prefetch_disable=1"
|
||||
$0 zfs="zfs_prefetch_disable=1 zfs_mdcomp_disable=1"
|
||||
$0 spl="spl_debug_mask=0"
|
||||
|
||||
EOF
|
||||
|
|
Loading…
Reference in New Issue