Brian Behlendorf
7c0e4cf7fe
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-06 10:55:38 -07:00
Brian Behlendorf
1c46ee7dc1
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-06 10:55:36 -07:00
Brian Behlendorf
a5895f71e6
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-06 10:55:28 -07:00
Brian Behlendorf
637b5e5c7c
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-08-06 10:55:26 -07:00
Brian Behlendorf
b677319cc3
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-08-06 10:55:19 -07:00
Brian Behlendorf
b03dc3b357
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-08-06 10:55:16 -07:00
Brian Behlendorf
2a5f49988c
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-08-06 10:55:08 -07:00
Brian Behlendorf
948b10b462
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-08-06 10:55:06 -07:00
Brian Behlendorf
711a5d60a5
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-08-06 10:54:58 -07:00
Brian Behlendorf
a83fa51e54
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-08-06 10:54:56 -07:00
Brian Behlendorf
eeecef2c7b
Merge branch 'linux-kernel-module' into refs/top-bases/linux-zfs-branch
2010-08-06 10:54:49 -07:00
Brian Behlendorf
bb6043ec12
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-08-06 10:54:46 -07:00
Brian Behlendorf
2209c58281
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-08-06 10:54:37 -07:00
Brian Behlendorf
b1917e6208
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-08-06 10:54:34 -07:00
Brian Behlendorf
f18af24801
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-08-06 10:54:26 -07:00
Brian Behlendorf
c412136664
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-08-06 10:54:23 -07:00
Brian Behlendorf
a2da24dbe3
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-08-06 10:54:16 -07:00
Brian Behlendorf
00ef1da191
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-08-06 10:54:13 -07:00
Brian Behlendorf
e985124efe
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-08-06 10:54:05 -07:00
Brian Behlendorf
f70896946c
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-08-06 10:54:02 -07:00
Brian Behlendorf
27432bb045
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-08-06 10:53:55 -07:00
Brian Behlendorf
1d610821b3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-08-06 10:53:53 -07:00
Brian Behlendorf
dc236f1d4d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-08-06 10:53:43 -07:00
Brian Behlendorf
c240da97b3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-08-06 10:53:41 -07:00
Brian Behlendorf
0dc1414e51
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-08-06 10:53:33 -07:00
Brian Behlendorf
fff1bace2b
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-08-06 10:53:31 -07:00
Brian Behlendorf
5e146eeed0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-08-06 10:53:22 -07:00
Brian Behlendorf
c7a7329202
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-08-06 10:53:20 -07:00
Brian Behlendorf
2d73de64aa
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-08-06 10:53:12 -07:00
Brian Behlendorf
743e2cde8f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-08-06 10:53:08 -07:00
Brian Behlendorf
366d749b22
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-08-06 10:53:00 -07:00
Brian Behlendorf
7e693479b0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-08-06 10:52:58 -07:00
Brian Behlendorf
aeb5b16642
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-08-06 10:52:49 -07:00
Brian Behlendorf
ef0d3c2130
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-08-06 10:52:46 -07:00
Brian Behlendorf
f7017594c4
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-08-06 10:52:39 -07:00
Brian Behlendorf
e39f83ccf5
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-08-06 10:52:36 -07:00
Brian Behlendorf
9e3e35dc3f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-08-06 10:52:35 -07:00
Brian Behlendorf
8f8d2b66aa
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-08-06 10:52:34 -07:00
Brian Behlendorf
86b29c0b9c
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-08-06 10:47:03 -07:00
Brian Behlendorf
2e982255da
Merge branch 'fix-zfs_ioc_objset_stats' into refs/top-bases/fix-branch
2010-08-06 10:47:02 -07:00
Brian Behlendorf
46e9b0989d
New TopGit dependency: fix-zfs_ioc_objset_stats
2010-08-06 10:46:58 -07:00
Brian Behlendorf
89f0abf9b5
Add missing zfs_ioc_objset_stats() error handling
...
Interestingly this looks like an upstream bug as well. If for some
reason we are unable to get a zvols statistics, because perhaps the
zpool is hopelessly corrupt, we would trigger the VERIFY. This
commit adds the proper error handling just to propagate the error
back to user space. Now the user space tools still must handle this
properly but in the worst case the tool will crash or perhaps have
some missing output. That's far far better than crashing the host.
Closes #45
2010-08-06 10:46:39 -07:00
Brian Behlendorf
e1d368d11e
Merge commit 'refs/top-bases/top' into top
2010-08-05 11:33:45 -07:00
Brian Behlendorf
b7b7b19478
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-08-05 11:33:43 -07:00
Brian Behlendorf
9e4b51ab27
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-08-05 11:33:41 -07:00
Brian Behlendorf
a87866c103
Merge branch 'linux-have-mlslabel' into refs/top-bases/linux-zfs-branch
2010-08-05 11:33:40 -07:00
Brian Behlendorf
ab023a0775
Merge commit 'refs/top-bases/linux-have-mlslabel' into linux-have-mlslabel
2010-08-05 11:33:38 -07:00
Brian Behlendorf
5d3b59fde5
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-08-05 11:33:31 -07:00
Brian Behlendorf
3adca629a0
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-08-05 11:33:29 -07:00
Brian Behlendorf
a7614b1564
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-08-05 11:33:22 -07:00
