930b48bd2c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-07-12 10:23:03 -07:00
b1ac2755a0
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-07-12 10:23:03 -07:00
d134105bba
Linux 2.6.34 compat: add_range() symbol collision
...
The prototype for an add_range() function was added to the kernel
header include/linux/range.h which conflicts with the static
add_range() defined in zfs_fm.c. To resolve the conflict all
range functions in zfs_fm.c have been prefixed with zei which
is short for the zfs_ecksum_info struct since all of these
functions operate on that base structure.
2010-07-12 10:13:07 -07:00
9820fd89a4
Explicitly cast sizeof() to avoid format warnings
...
Simply explicity cast sizeof() to a 'long int' these numbers will
always be small and the removes all ambiguity.
2010-07-12 10:12:19 -07:00
007b891fc7
Fix -Werror=format-security compiler option
...
Noticed under Ubuntu kernel builds, there were two instances where
printf() was not called with a "%s" and instread directly printed
the string. This can potentially result in a crash and is considered
bad form by gcc. It has been fixed by adding the needed "%s".
2010-07-12 10:11:48 -07:00
558da36f6b
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-02 14:05:01 -07:00
736230e779
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-02 14:04:58 -07:00
ed2a95f7d4
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:52 -07:00
d1c848172a
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-02 14:04:49 -07:00
f7bc5d899d
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:43 -07:00
5ab7e5e0e0
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-07-02 14:04:40 -07:00
285a0e478c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:34 -07:00
a5e80283bd
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-07-02 14:04:32 -07:00
f13b0fd952
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:25 -07:00
bf89df82e4
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-07-02 14:04:23 -07:00
4a77d84c9e
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:17 -07:00
b84fd528c3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-07-02 14:04:14 -07:00
85e0131726
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-07-02 14:04:07 -07:00
1c3e127596
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-07-02 14:04:05 -07:00
696f063a9a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:58 -07:00
f816b9db6d
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-07-02 14:03:56 -07:00
6d96a18295
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:49 -07:00
a2507275af
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-07-02 14:03:47 -07:00
9099c8ba1d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:41 -07:00
5a1fb48e54
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-07-02 14:03:38 -07:00
708d7adbc8
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:32 -07:00
69b3282799
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-07-02 14:03:30 -07:00
dbdfde3d21
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:22 -07:00
b17ca5c674
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-07-02 14:03:20 -07:00
1626b66785
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:13 -07:00
99fead1822
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-07-02 14:03:11 -07:00
d1f0255667
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-07-02 14:03:04 -07:00
ea39046f41
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-07-02 14:03:02 -07:00
6dff3d475a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-07-02 14:02:55 -07:00
d46db3a397
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-07-02 14:02:53 -07:00
5b646b38b3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-02 14:02:46 -07:00
d7e916a68f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-07-02 14:02:44 -07:00
9aeda80e48
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-07-02 14:02:37 -07:00
eadcc7288a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-07-02 14:02:34 -07:00
2fe7754343
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-07-02 14:02:28 -07:00
9dfcdee555
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-07-02 14:02:25 -07:00
77f748fd1c
Allow config/build to work with autoconf-2.65
...
As of autoconf-2.65 the AC_LANG_SOURCE source macro no longer
includes the confdef.h results when expanded. To handle this
simply explicitly include confdef.h in conftest.c. This will
cause two copies to of confdef.h to be added to the test for
earlier autoconf versions but this is not harmful.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2010-07-02 13:56:00 -07:00
3af0250f6d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-07-02 12:26:06 -07:00
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
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
be284778f9
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-07-01 20:48:13 -07:00
865c7277b3
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-07-01 20:48:11 -07:00
c9b96fab31
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-07-01 20:48:05 -07:00
6842754ac2
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-07-01 20:48:02 -07:00
244ea2fe42
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-07-01 20:47:56 -07:00
Brian Behlendorf
Lars Johannsen