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
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
64661f174f
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:45 -07:00
2495006545
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-02 15:31:43 -07:00
dfc9bf2351
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:37 -07:00
6efff5aac6
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-02 15:31:34 -07:00
c261b3e241
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:28 -07:00
e0ad8ffcb4
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-02 15:31:26 -07:00
d079b7da82
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:19 -07:00
319781e873
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-02 15:31:17 -07:00
86b05fafcd
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:11 -07:00
3fc23e1d2f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-02 15:31:08 -07:00
5c484fba8b
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-02 15:31:02 -07:00
29bd1f8bcf
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-02 15:30:59 -07:00
9770449812
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:54 -07:00
69a71fc334
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-02 15:30:51 -07:00
4ab890b36f
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:46 -07:00
b7ded8197e
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-02 15:30:44 -07:00
264e63a534
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:38 -07:00
7ebebd2f3d
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-02 15:30:36 -07:00
da70a72de5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:30 -07:00
6f0e3de0e4
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-02 15:30:28 -07:00
44cdd1eac0
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:21 -07:00
bd0c77e079
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-02 15:30:19 -07:00
6499a250fd
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:13 -07:00
776056d7f1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-02 15:30:11 -07:00
2af15f5813
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-02 15:30:05 -07:00
e331989e8a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-02 15:30:03 -07:00
cc22790f9c
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-02 15:29:57 -07:00
ec00e089d3
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-02 15:29:55 -07:00
9140f34e9a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-02 15:29:48 -07:00
640888ec74
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-02 15:29:46 -07:00
bf44e39499
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-02 15:29:39 -07:00
a8d9f13ab5
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-02 15:29:37 -07:00
c6e0144f79
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-02 15:29:31 -07:00
aa54b2619c
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-02 15:29:28 -07:00
8481c9b7bb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-02 15:29:28 -07:00
7e9bdac1a8
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-02 15:29:27 -07:00
8bf0a4e79c
Merge branch 'fix-stack-inline' into refs/top-bases/fix-branch
2010-08-02 15:29:25 -07:00
78798f0ea5
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-02 15:29:25 -07:00
45c00bf359
Fix spa_load_impl() prototype
...
Both the forward declaration of spa_load_impl() and the actual
function declaration must match.
2010-08-02 15:24:33 -07:00
Brian Behlendorf