Brian Behlendorf
c01ea509f6
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:02 -07:00
Brian Behlendorf
5e4314a4ed
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-21 15:35:00 -07:00
Brian Behlendorf
29d01df48d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-21 15:34:37 -07:00
Brian Behlendorf
8ad18a3e74
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-21 15:34:34 -07:00
Brian Behlendorf
2468e6d67d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-21 15:34:11 -07:00
Brian Behlendorf
230510ddac
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-21 15:34:09 -07:00
Brian Behlendorf
3e2e28cfa3
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-21 15:33:46 -07:00
Brian Behlendorf
ac1868953c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-21 15:33:44 -07:00
Brian Behlendorf
bcc7d1c258
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-21 15:33:21 -07:00
Brian Behlendorf
3fd78da576
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-21 15:33:18 -07:00
Brian Behlendorf
fa51680025
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:55 -07:00
Brian Behlendorf
c52e9f28a4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-21 15:32:53 -07:00
Brian Behlendorf
45c88a2f20
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:29 -07:00
Brian Behlendorf
909c60e23f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:32:27 -07:00
Brian Behlendorf
35c46bb0e5
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:04 -07:00
Brian Behlendorf
ea5ced8e55
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-21 15:32:02 -07:00
Brian Behlendorf
af12c8fa08
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:38 -07:00
Brian Behlendorf
4529531127
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-21 15:31:36 -07:00
Brian Behlendorf
77b2f748a0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:12 -07:00
Brian Behlendorf
08a4e1267d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-21 15:31:10 -07:00
Brian Behlendorf
733007a14c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-21 15:30:47 -07:00
Brian Behlendorf
b9eb575992
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-21 15:30:45 -07:00
Brian Behlendorf
84c7c5fb58
Prep for 0.4.9 tag update META, README, ChangeLog.
...
Updated README to reflect the current state of the project and to
be less developer focused. It now simply includes basic build
instructions for packages and little example of some of the cool
things you can do.
Also remove the out of data TODO file. This sort of thing can
and be tracked on the GitHub issue tracker.
2010-05-21 15:11:49 -07:00
Brian Behlendorf
4221c8cf93
Minor spec file cleanup for RHEL6 package dependency.
2010-05-21 15:08:08 -07:00
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
14152c7b2c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-21 10:49: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
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
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
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
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