0e215424e6
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-21 16:31:05 -07:00
77cd6f99f0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-21 16:30:51 -07:00
bcabe843b5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-21 16:30:50 -07:00
71827f878a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-21 16:30:49 -07:00
05f36f5404
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-07-21 16:30:35 -07:00
52edf9bf80
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-07-21 16:30:29 -07:00
481453976f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-07-21 16:30:21 -07:00
016734b818
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-21 16:30:20 -07:00
4ab7d1880a
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-21 16:30:12 -07:00
2d197d7351
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-21 16:30:10 -07:00
8a0159016f
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-07-21 16:29:53 -07:00
26ab10cac5
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-07-21 16:29:52 -07:00
e1fc63e7e1
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-07-21 16:29:44 -07:00
e8edf9dc09
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-21 16:29:42 -07:00
301730d8ca
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-21 16:29:35 -07:00
c09e7ed6d0
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-07-21 16:29:33 -07:00
4988767d65
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-21 16:29:25 -07:00
7a8a146a50
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-21 16:29:23 -07:00
b9c3c7a2f4
The losetup -f option is unavailable for SLES10 use unused_loop_device()
...
SLES10 ships util-linux-2.12r-35.30 which does not support the -f option
to losetup. To avoid this problem the unused_loop_device() function was
added which attempts to find an unused loop device by checking each
/dev/loop* device with losetup to see if it is configured.
2009-07-21 16:17:54 -07:00
1124f5b4d3
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-21 14:52:47 -07:00
04591d82bb
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-21 14:52:46 -07:00
efb9868b69
Pretty-up the 'make check' output
...
Reasonable output from 'make check' now looks roughly like this. The
big change is the consolidation of the all the zpion test results in
to a single table which can be easily scanned for failures/problems.
==================================== ZTEST ====================================
5 vdevs, 7 datasets, 23 threads, 300 seconds...
Pass 1, SIGKILL, 1 ENOSPC, 13.8% of 238M used, 17% done, 4m07s to go
Pass 2, SIGKILL, 1 ENOSPC, 23.7% of 238M used, 38% done, 3m04s to go
Pass 3, SIGKILL, 0 ENOSPC, 27.0% of 238M used, 66% done, 1m42s to go
Pass 4, SIGKILL, 0 ENOSPC, 27.4% of 238M used, 75% done, 1m14s to go
Pass 5, SIGKILL, 0 ENOSPC, 27.9% of 238M used, 89% done, 32s to go
Pass 6, Complete, 0 ENOSPC, 14.0% of 476M used, 100% done, 0s to go
5 killed, 1 completed, 83% kill rate
==================================== ZPIOS ====================================
status name id wr-data wr-ch wr-bw rd-data rd-ch rd-bw
-------------------------------------------------------------------------------
PASS: file-raid0 0 64m 64 13.04m 64m 64 842.22m
PASS: file-raid10 0 64m 64 134.19m 64m 64 842.22m
PASS: file-raidz 0 64m 64 87.56m 64m 64 853.45m
PASS: file-raidz2 0 64m 64 134.19m 64m 64 853.45m
PASS: lo-raid0 0 64m 64 429.59m 64m 64 14.63m
PASS: lo-raid10 0 64m 64 397.57m 64m 64 771.19m
PASS: lo-raidz 0 64m 64 206.48m 64m 64 688.27m
PASS: lo-raidz2 0 64m 64 14.34m 64m 64 711.21m
2009-07-21 14:41:35 -07:00
b8331dbc16
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-21 11:36:34 -07:00
e63baa3490
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-21 11:36:33 -07:00
41c17d43e3
Update to spl device interfaces for portability.
...
- Linux specific character device registration calls replaced with
the spl version for maximum portability between linux kernels.
- Added ZPIOS_NAME macro.
2009-07-21 11:26:53 -07:00
b813413d52
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-21 10:35:26 -07:00
6af0c921a6
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-21 10:35:24 -07:00
43ad6bb2ad
Register compat ioctl handlers for zpios + 32-bit safe timespec.
...
A compat ioctl handler for zpios was added which simply passes the
ioctl on to the usual handler. The IOWR macro's correctly handle
this. Additionally replace the use of 'struct timespec' which uses
longs internally and is therefore different sizes on 32-bit vs 64-bit
objects with 'struct zpios_timespec_t'. This custom structure uses
uint32_t types internally and is safe to pass through an ioctl. The
helper functions for this new type were also moved to a common place
so they may be used safely by the user or kernel code.
2009-07-21 10:22:47 -07:00
d8dc398c1d
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-20 13:26:06 -07:00
b3dab369eb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-20 13:26:05 -07:00
2b1eaf77d4
Remove zfs_debug.h which is a duplicate of the version in the
...
modules directory. Having two copies is just asking for trouble.
2009-07-20 13:18:24 -07:00
976344d9dc
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-17 09:46:24 -07:00
65e81abfed
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-17 09:46:23 -07:00
3a63d17619
Add option -fPIC (Position Independent Code) needed for x86_64.
...
While the generic atomic implementation is not used by default
for x86_64 or x86 builds, we still need to always build it with
-fPIC if we ever want to use it on these platforms.
2009-07-17 09:36:01 -07:00
8e00c3e5ff
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-16 13:46:16 -07:00
35e7382fd2
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-16 13:46:15 -07:00
18b7a966e4
Minor build fixes from asm-generic change.
...
- Drop _NOTE(CONSTCOND) usage in libspl this is Solaris specific.
- Resolve conflicting OR and AND long prototypes.
2009-07-16 13:37:59 -07:00
b606fd71bb
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-16 10:28:18 -07:00
ac81bc8094
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-16 10:28:14 -07:00
3ae0e369f3
Add generic user space atomic support.
...
Futher testing on my powerpc system revealed that the powerpc
specific atomic implemetation was flawed. Rather than spending
a lot of time correctly reimplementing it in assembly I have
reworked it in to a 100% generic version. The generic version
will not perform well but it does provide correct sematics. It
will be used only when there is no architecture specific version
available. These changes do not impact x86_64 and x86 which have
have correct native implementations.
2009-07-16 09:59:44 -07:00
d17bbef963
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-07-14 16:56:43 -07:00
c8782fbd0a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-14 16:56:39 -07:00
8258757e75
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-14 16:56:35 -07:00
506f20183e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-07-14 16:56:22 -07:00
adf7187906
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-07-14 16:56:17 -07:00
f4a071a80e
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-14 16:56:04 -07:00
f7ea79b354
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-14 16:56:00 -07:00
d8e0f98f84
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-07-14 16:55:46 -07:00
ee2dddb6a4
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-07-14 16:55:41 -07:00
24e9f6bc06
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-14 16:55:25 -07:00
Brian Behlendorf