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

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

This commit is contained in:
Brian Behlendorf 2009-01-09 13:33:14 -08:00
parent 711774c008 7357c92d76
commit bf5a93e1ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/Makefile.in
View File

@ -1,6 +1,6 @@
DISTFILES = *.c DISTFILES = *.c
MODULE := zpool MODULE := zfs
EXTRA_CFLAGS = -I@MODDIR@/zfs/include EXTRA_CFLAGS = -I@MODDIR@/zfs/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include

2
module/zfs/zfs_ioctl.c
View File

@ -2214,7 +2214,7 @@ zfs_ioc_snapshot(zfs_cmd_t *zc)
if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0) if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0)
return (EINVAL); 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, (error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
&nvprops)) != 0) &nvprops)) != 0)
return (error); return (error);

6
scripts/zfs.sh
View File

@ -22,7 +22,7 @@ zfs_modules=( \
${MODDIR}/nvpair/znvpair.ko \ ${MODDIR}/nvpair/znvpair.ko \
${MODDIR}/unicode/zunicode.ko \ ${MODDIR}/unicode/zunicode.ko \
${MODDIR}/zcommon/zcommon.ko \ ${MODDIR}/zcommon/zcommon.ko \
${MODDIR}/zfs/zpool.ko \ ${MODDIR}/zfs/zfs.ko \
) )
test_modules=( \ test_modules=( \
@ -58,8 +58,8 @@ OPTIONS:
MODULE-OPTIONS: MODULE-OPTIONS:
Must be of the frm module="options", for example: Must be of the frm module="options", for example:
$0 zpool="zfs_prefetch_disable=1" $0 zfs="zfs_prefetch_disable=1"
$0 zpool="zfs_prefetch_disable=1 zfs_mdcomp_disable=1" $0 zfs="zfs_prefetch_disable=1 zfs_mdcomp_disable=1"
$0 spl="spl_debug_mask=0" $0 spl="spl_debug_mask=0"
EOF EOF