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

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2009-08-14 10:24:56 -07:00
parent a849dfe835 503a1a983c
commit 96691c41af
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ztest/ztest.c
View File

@ -1176,7 +1176,7 @@ grow_vdev(vdev_t *vd, void *arg)
return (vd);
fsize = lseek(fd, 0, SEEK_END);
(void) ftruncate(fd, *newsize);
VERIFY(ftruncate(fd, *newsize) == 0);
if (zopt_verbose >= 6) {
(void) printf("%s grew from %lu to %lu bytes\n",

28
zfs-modules.spec.in
View File

@ -3,9 +3,17 @@
# require_kver, require_kdir, require_obj constants for us, but if it does not
# not we attempt to determine the correct values based on your distro.
%{?require_kver: %define kver %{require_kver}}
%{?require_kdir: %define kdir %{require_kdir}}
%{?require_kobj: %define kobj %{require_kobj}}
%if %{defined require_kver}
%define kver %{require_kver}
%endif
%if %{defined require_kdir}
%define kdir %{require_kdir}
%endif
%if %{defined require_kobj}
%define kobj %{require_kobj}
%endif
# kdir: Full path to the kernel source headers
# kobj: Full path to the kernel build objects
@ -14,9 +22,17 @@
# kdevpkg: Kernel devel package name
# kverpkg: Kernel package version
%{?require_splver: %define splver %{require_splver}}
%{?require_spldir: %define spldir %{require_spldir}}
%{?require_splobj: %define splobj %{require_splobj}}
%if %{defined require_splver}
%define splver %{require_splver}
%endif
%if %{defined require_spldir}
%define spldir %{require_spldir}
%endif
%if %{defined require_splobj}
%define splobj %{require_splobj}
%endif
# spldir: Full path to the spl source headers
# splobj: Full path to the spl build objects