Brian Behlendorf
3af0250f6d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-02 12:26:06 -07:00
Brian Behlendorf
45cb33f64f
Ensure devices are always created/removed
...
Devices were only being created at module load time or when a
dataset was created. Similiar devices were not always being
removed at all the correct times. This patch updates all the
places where devices should either be created or removed. I'm
reasonably sure I got them all but if theres a case I missed
we can catch it with a follow up patch.
module load/unload
zfs create/remove
zpool import/export
zpool destroy
This patch also adds a simple regression test to zconfig.sh
to ensure zpool import/export is basically working properly.
This test specifically checks that devices are created
properly, removed after export, created after import, and
removed as a consequence of a zpool destroy.
2010-07-02 12:21:39 -07:00
Brian Behlendorf
122e5b44e1
Add missing mutex_exit(&zvol_state_lock)
...
With the recent ZVOL update zvol_set_volblocksize() accidentally
lost its mutex_exit(). This was noticed when zvol_create_minor()
blocked on the zvol_state_lock while it was holding the
spa_namespace_lock(). This caused everything to get blocked
up and hung the system.
2010-07-02 12:19:54 -07:00
Brian Behlendorf
be284778f9
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-01 20:48:13 -07:00
Brian Behlendorf
865c7277b3
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-01 20:48:11 -07:00
Brian Behlendorf
c9b96fab31
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-01 20:48:05 -07:00
Brian Behlendorf
6842754ac2
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-01 20:48:02 -07:00
Brian Behlendorf
244ea2fe42
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:56 -07:00
Brian Behlendorf
8174d852b8
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-01 20:47:54 -07:00
Brian Behlendorf
4318d4e0fa
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:48 -07:00
Brian Behlendorf
157ed55f71
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-01 20:47:45 -07:00
Brian Behlendorf
38bdd6cf0a
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:39 -07:00
Brian Behlendorf
6065ea087f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-01 20:47:36 -07:00
Brian Behlendorf
60d0a79a60
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:30 -07:00
Brian Behlendorf
65e22bdfeb
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-01 20:47:28 -07:00
Brian Behlendorf
0bbe2b4fe6
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:21 -07:00
Brian Behlendorf
60c4cb77c7
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-01 20:47:19 -07:00
Brian Behlendorf
95ad29bc0d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:12 -07:00
Brian Behlendorf
61810a8185
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-01 20:47:10 -07:00
Brian Behlendorf
4fcf8ddba6
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:04 -07:00
Brian Behlendorf
62e53bdc21
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-01 20:47:01 -07:00
Brian Behlendorf
967032f3a9
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:55 -07:00
Brian Behlendorf
9dca3ac606
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-01 20:46:52 -07:00
Brian Behlendorf
22246d3174
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:46 -07:00
Brian Behlendorf
c2f41fbe8d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-01 20:46:44 -07:00
Brian Behlendorf
1b41e349a3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:37 -07:00
Brian Behlendorf
7c207154b8
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-01 20:46:35 -07:00
Brian Behlendorf
866b01fda6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:28 -07:00
Brian Behlendorf
e624241845
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-01 20:46:26 -07:00
Brian Behlendorf
ee180489fa
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:19 -07:00
Brian Behlendorf
46f3be8885
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-01 20:46:16 -07:00
Brian Behlendorf
0f2fec7d45
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:10 -07:00
Brian Behlendorf
d0b27d1809
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-01 20:46:08 -07:00
Brian Behlendorf
4089ba67ee
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-01 20:46:01 -07:00
Brian Behlendorf
b11386351e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-01 20:45:59 -07:00
Brian Behlendorf
b2e6d23515
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-01 20:45:52 -07:00
Brian Behlendorf
ff1c08eeca
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-01 20:45:49 -07:00
Brian Behlendorf
8728219d6a
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-01 20:45:43 -07:00
Brian Behlendorf
268e6ef364
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-01 20:45:41 -07:00
Brian Behlendorf
61119d3f5b
Linux-2.6.33 compat, check <generated/utsrelease.h> for UTS_RELEASE
...
It seems the upstream community moved the definition of UTS_RELEASE
yet again as of linux-2.6.33. Update the build system to check in
all three possible locations where your kernel version may be defined.
$kernelbuild/include/linux/version.h
$kernelbuild/include/linux/utsrelease.h
$kernelbuild/include/generated/utsrelease.h
2010-07-01 20:43:36 -07:00
Brian Behlendorf
e42a4778d8
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:46 -07:00
Brian Behlendorf
865a22addb
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-01 10:44:44 -07:00
Brian Behlendorf
007377d1d3
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:38 -07:00
Brian Behlendorf
747d9474df
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-01 10:44:35 -07:00
Brian Behlendorf
56b38c66ec
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:29 -07:00
Brian Behlendorf
3cafb6a2f7
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-01 10:44:27 -07:00
Brian Behlendorf
8b90a38c38
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:20 -07:00
Brian Behlendorf
9ea482e7f5
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-01 10:44:18 -07:00
Brian Behlendorf
3690d0b96f
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-01 10:44:11 -07:00
Brian Behlendorf
dc6723965d
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-01 10:44:09 -07:00