3bd810a6c9
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:34 -07:00
b00eda8b35
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-01 17:08:32 -07:00
10e8860df3
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:27 -07:00
2b729a2a6f
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-01 17:08:25 -07:00
e0a87f7ea8
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:19 -07:00
9b8183fad8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-01 17:08:18 -07:00
fca44b80e9
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:12 -07:00
e6359e0281
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-01 17:08:10 -07:00
3c5e68488a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-01 17:08:09 -07:00
cd01e2a6c9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:00 -07:00
ea0bf0146f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-01 17:07:58 -07:00
edd6ead31c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-01 17:07:57 -07:00
9fd246a1d3
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:47 -07:00
11b75fb752
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-01 17:07:46 -07:00
96e4ebf5ad
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:41 -07:00
29e58523ee
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-01 17:07:38 -07:00
c8a2fd3bd4
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:33 -07:00
eac0059874
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-10-01 17:07:31 -07:00
bba7a008b5
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:26 -07:00
6bdc74929b
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-10-01 17:07:24 -07:00
0c8583d3f7
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-01 17:07:19 -07:00
7eea1664aa
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-01 17:07:17 -07:00
8d3df842d1
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-10-01 17:05:55 -07:00
0613918a4a
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-01 17:04:19 -07:00
0efea24e73
Add zconfig.sg test script.
...
This is an initial script for validation of zfs/zpool configuration.
For now there is only one test here to ensure that /etc/zfs/zpool.cache
is being updated properly from the kernel module. Additional tests
should be added, I believe Richardo said there was an existing test
suite out there which validated the behavior of many zpool/zfs commands.
It would be nice to add that as appropriate.
2009-10-01 16:55:34 -07:00
6e2c55b5a6
Update to use spl_module_{init,exit}() macro API.
2009-10-01 16:47:49 -07:00
159833d991
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-09-02 15:26:43 -07:00
c39498254d
Extra reference required for dio struct in __vdev_disk_physio.
...
Exposed by the fc11 debug kernel we need to hold a reference over all
calls to submit_bio(). Otherwise it is possible all the completion
callbacks run before we exit __vdev_disk_physio(), and we end up with
a GPF. This was quickly exposed when slab poisoning was enabled. I
have added helper functions to cleanly track the reference counts. In
addition dr->dr_ref was converted from an integer to an atomic type
which removes the need for the spinlock. As a nice side effect of
these changes the code is now slightly cleaner and clearer.
2009-09-02 15:08:40 -07:00
c80d8efea2
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-18 14:55:19 -07:00
af90397fbc
Move ZPIOS chunk to linux-zpios topic branch
2009-08-18 14:48:25 -07:00
89941e9170
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-18 14:22:50 -07:00
30218c428f
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-18 14:22:48 -07:00
6d85208db4
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-18 14:22:39 -07:00
b6443b0f26
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-18 14:22:36 -07:00
07dd64facf
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-18 14:22:27 -07:00
1365576b3e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-18 14:22:24 -07:00
2158fbf9bc
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-18 14:22:14 -07:00
5784c67072
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-18 14:22:11 -07:00
0a04b4bebb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-18 14:22:02 -07:00
547471e842
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-18 14:22:00 -07:00
7511ee93b8
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-18 14:21:50 -07:00
cd710627dd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-18 14:21:47 -07:00
7c2fdfbc49
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-18 14:21:38 -07:00
060284b353
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-18 14:21:35 -07:00
ed5db69c5d
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-18 14:21:26 -07:00
0076202c0f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-18 14:21:23 -07:00
a92654d324
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-18 14:21:13 -07:00
a8b8cc4801
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-18 14:21:10 -07:00
15ccc2b9a4
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-18 14:21:01 -07:00
1c5a67a320
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-18 14:20:58 -07:00
Brian Behlendorf