Brian Behlendorf
1186ea3781
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-10 09:59:14 -08:00
Brian Behlendorf
7223b8df33
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-10 09:58:04 -08:00
Brian Behlendorf
54cf7ab2bc
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-10 09:58:03 -08:00
Brian Behlendorf
104e33e79b
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-10 09:54:44 -08:00
Brian Behlendorf
166355dcf0
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-10 09:54:43 -08:00
Brian Behlendorf
33d6f7ee08
New TopGit dependency: fix-error-handling
2010-03-10 09:54:41 -08:00
Ricardo M. Correia
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
Brian Behlendorf
a3a09a32d3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 14:55:54 -08:00
Ricardo M. Correia
4853ac3d53
Fix scripts to work when invoked from other directories.
2010-03-09 14:50:15 -08:00
Brian Behlendorf
fee91f276a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-09 14:21:16 -08:00
Brian Behlendorf
9ac35e4fe5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 14:20:05 -08:00
Brian Behlendorf
6fb1ab89a6
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 14:20:04 -08:00
Brian Behlendorf
b3928389da
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 14:20:03 -08:00
Brian Behlendorf
00cf79214f
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 14:20:02 -08:00
Brian Behlendorf
3907283e25
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 14:20:02 -08:00
Brian Behlendorf
9ae782821b
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-09 14:20:01 -08:00
Brian Behlendorf
df67dd9d47
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-09 14:20:00 -08:00
Brian Behlendorf
c3d51e4110
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-09 14:20:00 -08:00
Brian Behlendorf
48109ca39e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-09 14:19:58 -08:00
Brian Behlendorf
a28859f839
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-09 14:19:57 -08:00
Brian Behlendorf
9acc9e9b20
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-09 14:19:56 -08:00
Brian Behlendorf
e7393825e4
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-09 14:19:56 -08:00
Brian Behlendorf
2f0a19285c
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-09 14:19:55 -08:00
Brian Behlendorf
8521d73733
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-09 14:19:54 -08:00
Brian Behlendorf
3bacff1e54
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-09 14:19:53 -08:00
Brian Behlendorf
cada9b634c
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-09 14:19:53 -08:00
Brian Behlendorf
342ab93948
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-03-09 14:19:52 -08:00
Brian Behlendorf
94ff11c3e0
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-09 14:19:52 -08:00
Brian Behlendorf
4d9d0dbbf0
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-03-09 14:19:50 -08:00
Brian Behlendorf
75ffcce707
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-03-09 14:19:50 -08:00
Brian Behlendorf
889814b195
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-03-09 14:19:49 -08:00
Brian Behlendorf
c2931dff76
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-03-09 14:19:49 -08:00
Brian Behlendorf
c08729c194
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-03-09 14:19:48 -08:00
Brian Behlendorf
be64029df4
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-09 14:19:47 -08:00
Brian Behlendorf
001f726de5
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-03-09 14:19:46 -08:00
Brian Behlendorf
09c493ba56
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-03-09 14:19:45 -08:00
Brian Behlendorf
e1057463c2
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-03-09 14:19:44 -08:00
Brian Behlendorf
af42419e00
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-03-09 14:19:44 -08:00
Brian Behlendorf
ad72ea5360
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-09 14:19:43 -08:00
Brian Behlendorf
f0f4a7a1c2
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-09 14:19:43 -08:00
Brian Behlendorf
64f5e0e77b
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-03-09 14:19:42 -08:00
Brian Behlendorf
01db66d450
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-09 14:19:41 -08:00
Brian Behlendorf
f19f8e5dcc
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-09 14:19:40 -08:00
Brian Behlendorf
d5b5666f2e
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-09 14:19:40 -08:00
Brian Behlendorf
5fc733bc97
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-09 14:19:39 -08:00
Brian Behlendorf
b1a86e0752
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-09 14:19:39 -08:00
Brian Behlendorf
8515a07c0f
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-09 14:19:38 -08:00
Brian Behlendorf
881d65ec2b
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-09 14:19:37 -08:00
Brian Behlendorf
d0389e24d5
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-09 14:19:36 -08:00
Brian Behlendorf
60a00a6316
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-09 14:19:36 -08:00