7223b8df33
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-10 09:58:04 -08:00
54cf7ab2bc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-10 09:58:03 -08:00
104e33e79b
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-10 09:54:44 -08:00
166355dcf0
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-10 09:54:43 -08:00
33d6f7ee08
New TopGit dependency: fix-error-handling
2010-03-10 09:54:41 -08:00
62a0ac8f22
Fix some incorrect error handling.
...
In vn_open(), if fstat64() returned an error, the real errno
was being obscured by calling close().
Add error handling for both pwrite64() calls in vn_rdwr().
2010-03-10 09:53:53 -08:00
5c9d4629ee
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-09 14:56:32 -08:00
01aaa755f6
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-09 14:56:30 -08:00
b077eb69ea
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-09 14:56:25 -08:00
6858ca3c59
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 14:56:23 -08:00
22f524e95d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-09 14:56:18 -08:00
838036387f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-09 14:56:16 -08:00
7065a98f8c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-09 14:56:10 -08:00
f37bef03cc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-09 14:56:09 -08:00
555d9b091c
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-09 14:56:03 -08:00
037d965f04
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 14:56:01 -08:00
34bd418235
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:56 -08:00
a3a09a32d3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 14:55:54 -08:00
dd4c13e152
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:49 -08:00
ba063484bc
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-09 14:55:47 -08:00
8529dfe47f
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:42 -08:00
899e9822bc
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-09 14:55:40 -08:00
516af1eee2
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:35 -08:00
f945e8303d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 14:55:33 -08:00
bb031a5c6c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:28 -08:00
9e1a0e8fa4
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 14:55:26 -08:00
f5413ca75a
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:21 -08:00
89bfc2d5f4
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 14:55:19 -08:00
44430ed22f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 14:55:18 -08:00
9340897a1e
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:09 -08:00
025a2cb57d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-03-09 14:55:07 -08:00
2be3261b8b
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-03-09 14:55:02 -08:00
1810aa4e46
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-03-09 14:55:00 -08:00
9d73a6f2c9
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 14:54:55 -08:00
80adad93a1
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 14:54:53 -08:00
ab5135f609
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 14:54:48 -08:00
379372e6df
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-03-09 14:54:46 -08:00
17c7323211
Fix scripts to work when invoked from other directories.
2010-03-09 14:51:49 -08:00
4853ac3d53
Fix scripts to work when invoked from other directories.
2010-03-09 14:50:15 -08:00
058bc80b40
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-09 14:21:54 -08:00
2247d2e3b6
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-09 14:21:53 -08:00
9d26e61044
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-09 14:21:47 -08:00
19279fff1e
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-09 14:21:45 -08:00
d2e7ffe7cb
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-09 14:21:40 -08:00
e60a64be56
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-09 14:21:38 -08:00
d3a75228cd
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-09 14:21:33 -08:00
f8a7688add
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-09 14:21:31 -08:00
b0b8ddc028
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-09 14:21:25 -08:00
6b61087168
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 14:21:24 -08:00
e060659183
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-09 14:21:18 -08:00
Brian Behlendorf
Ricardo M. Correia