e0e0ee9862
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-03 16:04:47 -07:00
cae3fb7556
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-03 16:04:42 -07:00
e8871dbfaf
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-03 16:04:40 -07:00
da306ae41d
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-03 16:04:34 -07:00
8bd970935c
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-03 16:04:32 -07:00
bc57441274
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-03 16:04:26 -07:00
8c051ed3f4
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-03 16:04:24 -07:00
a57d483043
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-03 16:04:18 -07:00
e5a61eee9d
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-03 16:04:16 -07:00
8f95bd3853
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-03 16:04:10 -07:00
dc7e820e7f
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-03 16:04:08 -07:00
4d2216357c
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-03 16:04:02 -07:00
bfceec0b53
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-03 16:04:00 -07:00
bdcf982396
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:54 -07:00
d48e566806
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-03 16:03:52 -07:00
ad3a447664
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:46 -07:00
88879e6e8d
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-03 16:03:44 -07:00
adc8f9455b
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:38 -07:00
c2ed58313d
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-03 16:03:36 -07:00
45506f87fd
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:30 -07:00
30ead1a620
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-03 16:03:28 -07:00
fda24b60e5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:22 -07:00
a84164e81c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-03 16:03:20 -07:00
1cd7da3beb
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:14 -07:00
a469c62186
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-03 16:03:12 -07:00
c891ca01c6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-03 16:03:06 -07:00
072418b458
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-03 16:03:04 -07:00
241b8bba33
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-03 16:02:58 -07:00
0a6861870e
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-03 16:02:56 -07:00
ded874ed39
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-03 16:02:51 -07:00
9cb6a0067d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-03 16:02:49 -07:00
f216be8859
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-03 16:02:43 -07:00
a54f5dddf1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-03 16:02:41 -07:00
34bc488111
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-03 16:02:33 -07:00
b8c7d3bea4
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-03 16:02:31 -07:00
888942a40f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-03 16:02:23 -07:00
72e9483d97
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-03 16:02:21 -07:00
63a645c3c8
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-03 16:02:21 -07:00
1b9fd31ada
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-03 16:02:20 -07:00
3eff30685e
Set zv->zv_objset for zil_replay() case
...
For the case where we have a zil to replay we need to ensure that
zv->zv_objset contains the current objset. Since the caller has
a hold on the object set it is safe to pass to zil_replay as part
of the zv. Call path zvol_create_minor()->zil_replay()->
zil_parse()->zil_replay_log_record()->zvol_replay_write().
2010-08-03 15:57:05 -07:00
2cb5528450
Merge branch 'fix-bpobj_close' into refs/top-bases/fix-branch
2010-08-03 15:56:53 -07:00
670b33090f
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-03 15:56:53 -07:00
84eae057e7
New TopGit dependency: fix-bpobj_close
2010-08-03 15:56:49 -07:00
3253b39fa6
Set bpo->bpo_object = 0 on close to allow retry
...
During spa_load the spl->spa_deferred_bpobj maybe be opened and closed
multiple times. It's critical that when the object is closed the
bpo->bpo_object is set to zero to indicate the object is closed.
If it's not during spl_load_retry the spl->spa_deferred_bpobj can
be closes twice resulting in a NULL deref.
This appears to have been fixed upstream the same way.
2010-08-03 15:56:29 -07:00
8bf52af324
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-02 15:32:05 -07:00
f15a49f947
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-02 15:32:03 -07:00
4df1bed982
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-02 15:32:02 -07:00
6db4d7540f
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-02 15:32:00 -07:00
6fb42c71d3
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:53 -07:00
e3cd54423c
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-02 15:31:51 -07:00
Brian Behlendorf