Brian Behlendorf
ff872606f6
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-11-24 12:48:12 -08:00
Brian Behlendorf
22dedcb7ff
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-11-24 12:48:07 -08:00
Brian Behlendorf
5c2e3c5b64
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-11-24 12:48:05 -08:00
Brian Behlendorf
d531784971
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-11-24 12:47:59 -08:00
Brian Behlendorf
3645d79a1d
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-11-24 12:47:57 -08:00
Brian Behlendorf
27bda60b11
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-11-24 12:47:56 -08:00
Brian Behlendorf
4d63dbd849
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-11-24 12:47:45 -08:00
Brian Behlendorf
708313ebd5
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 12:47:43 -08:00
Brian Behlendorf
d5010f7693
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-11-24 12:47:37 -08:00
Brian Behlendorf
052da27e01
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-11-24 12:47:35 -08:00
Brian Behlendorf
990b121b0e
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-11-24 12:47:29 -08:00
Brian Behlendorf
13fd6a1cf2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-24 12:47:27 -08:00
Brian Behlendorf
aa0b79ac1a
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-11-24 12:47:21 -08:00
Brian Behlendorf
7ef25bb69d
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-11-24 12:47:19 -08:00
Brian Behlendorf
eb6f06154b
Prep for 0.4.7 tag, updated META and ChangeLog.
2009-11-24 12:43:40 -08:00
Brian Behlendorf
11c7571d4d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-11-20 16:22:39 -08:00
Brian Behlendorf
ccb5d410c2
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-11-20 16:22:37 -08:00
Brian Behlendorf
7ff25480f4
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-11-20 16:22:32 -08:00
Brian Behlendorf
13414ce622
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-11-20 16:22:30 -08:00
Brian Behlendorf
6143c0c6d5
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-11-20 16:22:25 -08:00
Brian Behlendorf
f3737c337a
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-11-20 16:22:23 -08:00
Brian Behlendorf
20e53e88f5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-11-20 16:22:18 -08:00
Brian Behlendorf
afb0d3e3be
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-11-20 16:22:16 -08:00
Brian Behlendorf
ee077f78ad
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-11-20 16:22:10 -08:00
Brian Behlendorf
e6f9a54ceb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-20 16:22:08 -08:00
Brian Behlendorf
3c773079d0
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-11-20 16:22:02 -08:00
Brian Behlendorf
c21ef90b8f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-11-20 16:22:00 -08:00
Brian Behlendorf
81420e893d
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:54 -08:00
Brian Behlendorf
45be985bcd
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-11-20 16:21:52 -08:00
Brian Behlendorf
768369a084
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:46 -08:00
Brian Behlendorf
17024ff94e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-11-20 16:21:44 -08:00
Brian Behlendorf
e1588f2c3b
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:38 -08:00
Brian Behlendorf
54f515cb49
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-11-20 16:21:36 -08:00
Brian Behlendorf
d33c6d5c80
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:30 -08:00
Brian Behlendorf
0b03d82241
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-11-20 16:21:28 -08:00
Brian Behlendorf
96007b8659
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:22 -08:00
Brian Behlendorf
3b1a5aede4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-11-20 16:21:20 -08:00
Brian Behlendorf
b9ab6dc4cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-11-20 16:21:19 -08:00
Brian Behlendorf
a87325f31a
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:09 -08:00
Brian Behlendorf
b8ed184744
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-20 16:21:06 -08:00
Brian Behlendorf
f765749174
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-11-20 16:21:01 -08:00
Brian Behlendorf
93ed4372fa
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-11-20 16:20:58 -08:00
Brian Behlendorf
8f18ff7a58
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-11-20 16:20:52 -08:00
Brian Behlendorf
ba05b614cb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-20 16:20:50 -08:00
Brian Behlendorf
a47fe1a6be
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-11-20 16:20:45 -08:00
Brian Behlendorf
1d74603aa5
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-11-20 16:20:43 -08:00
Brian Behlendorf
c14a8b2272
Ensure *.order and *.markers build products are removed by distclean rule.
2009-11-20 16:17:16 -08:00
Brian Behlendorf
2feb4008e6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-11-20 12:12:33 -08:00
Brian Behlendorf
45a5551a0e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_ioctl.c
2009-11-20 12:11:23 -08:00
Brian Behlendorf
aebe6818a9
Linux ZVOL implementation; user-side changes
...
At last a useful user space interface for the Linux ZFS port arrives.
With the addition of the ZVOL real ZFS based block devices are available
and can be compared head to head with Linux's MD and LVM block drivers.
The Linux ZVOL has not yet had any performance work done but from a user
perspective it should be functionally complete and behave like any other
Linux block device.
The ZVOL has so far been tested using zconfig.sh on the following x86_64
based platforms: FC11, CHAOS4, RHEL5, RHEL6, and SLES11. However, more
testing is required to ensure everything is working as designed.
What follows in a somewhat detailed list of changes includes in this
commit to make ZVOL's possible. A few other issues were addressed in
the context of these changes which will also be mentioned.
* zvol_create_link_common() simplified to simply issue to ioctl to
create the device and then wait up to 10 seconds for it to appear.
The device will be created within a few miliseconds by udev under
/dev/<pool>/<volume>. Note this naming convention is slightly
different than on Solaris by I feel is more Linuxy.
* Removed support for dump vdevs. This concept is specific to Solaris
and done not map cleanly to Linux. Under Linux generating system cores
is perferably done over the network via netdump, or alternately to a
block device via O_DIRECT.
2009-11-20 12:00:08 -08:00