Brian Behlendorf
1573fc9932
Cast to (const time_t *) to fix compiler type warning.
2010-05-21 15:06:25 -07:00
Brian Behlendorf
94655e1c30
Use __blk_end_request() in zvol_request() to avoid ZVOL deadlock.
...
The unlocked version of blk_end_request() should be used in the
zvol_request() error handling to avoid deadlocking the request_queue
queue_lock. Things get a little more complicated for older kernel
APIs but the compat layer has been updated as well to reflect this.
2010-05-21 15:01:12 -07:00
Brian Behlendorf
e3dffec8a9
Merge commit 'refs/top-bases/top' into top
2010-05-21 10:51:54 -07:00
Brian Behlendorf
3193647679
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-21 10:51:52 -07:00
Brian Behlendorf
33fc467c69
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-21 10:49:48 -07:00
Brian Behlendorf
14152c7b2c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-21 10:49:47 -07:00
Brian Behlendorf
6c40ff0b93
New TopGit dependency: linux-user-util
2010-05-21 10:48:47 -07:00
Brian Behlendorf
868e5de066
Add linux-user-util topic branch.
...
This topic branch contains required changes to the user space
utilities to allow them to integrate cleanly with Linux.
2010-05-21 10:47:59 -07:00
Brian Behlendorf
a46d524527
Merge commit 'refs/top-bases/top' into top
2010-05-21 10:44:33 -07:00
Brian Behlendorf
13ed2ef931
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-21 10:44:31 -07:00
Brian Behlendorf
11e4cd8f39
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-21 10:44:29 -07:00
Brian Behlendorf
3b79eba6d7
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-21 10:44:28 -07:00
Brian Behlendorf
13994d6e87
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-21 10:44:25 -07:00
Brian Behlendorf
a876892309
Revert user space changes from linux-kernel-module topic branch.
...
These changes do not belong on linux-kernel-module since they
are tweaks to user space utilities. I'm reverting them from
this topic branch and will be moving them to a new topic branch
which can be used for just this sort of thing.
2010-05-21 10:40:09 -07:00
Brian Behlendorf
5ab54ea455
Merge commit 'refs/top-bases/top' into top
2010-05-20 17:17:46 -07:00
Brian Behlendorf
82ff090a26
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-20 17:17:45 -07:00
Brian Behlendorf
0e0bf0495b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-20 17:17:43 -07:00
Brian Behlendorf
a221019e82
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 17:17:42 -07:00
Brian Behlendorf
cdd590f8b9
Recreate volume and snapshot /dev links during module load.
...
Links in /dev for volumes/snapshots were only being created
at volume/snapshot creation time. Those links are now also
created dynamically at module load time based on the spa config.
In other words all you need to do to get access to your zfs
datasets after a reboot is load the module. It's magic!
2010-05-20 16:59:02 -07:00
Brian Behlendorf
b814345c10
Merge commit 'refs/top-bases/top' into top
2010-05-20 14:51:17 -07:00
Brian Behlendorf
e0309d9f3c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-20 14:51:16 -07:00
Brian Behlendorf
edb2d17154
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-20 14:51:14 -07:00
Brian Behlendorf
c8d574777d
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 14:51:13 -07:00
Brian Behlendorf
fe3cca82ae
Support KM_NODEBUG kmem flag.
...
It turns out the zil allocates quite large buffers. This isn't
all the surprising but we need to suppress the warnings until
it's clear what to do about it.
2010-05-20 14:35:02 -07:00
Brian Behlendorf
fc8f478f3e
Merge commit 'refs/top-bases/top' into top
2010-05-20 10:29:56 -07:00
Brian Behlendorf
89375ef80b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-20 10:29:55 -07:00
Brian Behlendorf
ed4299321e
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-20 10:29:53 -07:00
Brian Behlendorf
7b86766ab9
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-20 10:29:52 -07:00
Brian Behlendorf
312e95b093
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-20 10:29:50 -07:00
Brian Behlendorf
6a740514a9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-20 10:29:49 -07:00
Brian Behlendorf
822d7a066e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-20 10:29:04 -07:00
Brian Behlendorf
0d2b12f8aa
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-20 10:29:02 -07:00
Brian Behlendorf
386fbea62a
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-20 10:28:39 -07:00
Brian Behlendorf
d60a534881
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-20 10:28:37 -07:00
Brian Behlendorf
09dcf4870d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-20 10:28:14 -07:00
Brian Behlendorf
093ac1d081
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-20 10:28:12 -07:00
Brian Behlendorf
83879ba568
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-20 10:27:50 -07:00
Brian Behlendorf
391f4e0072
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-20 10:27:48 -07:00
Brian Behlendorf
dcf475661d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-20 10:27:25 -07:00
Brian Behlendorf
3cafd278a9
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-20 10:27:23 -07:00
Brian Behlendorf
d9e1a60854
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-20 10:27:00 -07:00
Brian Behlendorf
2312b75f9a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-20 10:26:58 -07:00
Brian Behlendorf
2134721e6e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-20 10:26:35 -07:00
Brian Behlendorf
46fb31d60c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-20 10:26:33 -07:00
Brian Behlendorf
19035d1734
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 10:26:10 -07:00
Brian Behlendorf
84506949ec
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-20 10:26:08 -07:00
Brian Behlendorf
d04b8e9fa2
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:45 -07:00
Brian Behlendorf
3a9c2a23b7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-20 10:25:43 -07:00
Brian Behlendorf
c7068a5d76
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:20 -07:00
Brian Behlendorf
588a449812
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-20 10:25:18 -07:00
