d03db3ec68
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-04-29 10:41:28 -07:00
aeea026fe9
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-04-29 10:41:27 -07:00
5bd5bf096a
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-04-29 10:41:26 -07:00
a94b5a1f11
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-04-29 10:41:25 -07:00
86049947d8
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-04-29 10:41:24 -07:00
13668b7879
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-04-29 10:41:23 -07:00
f2ca1d7334
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-04-29 10:41:22 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
05926244c0
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-03-11 09:55:34 -08:00
858e56fbb4
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-11 09:55:34 -08:00
c997dd4d16
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-11 09:55:33 -08:00
48bf985a0e
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-11 09:55:32 -08:00
b7391af874
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-11 09:55:31 -08:00
8fc5cb913d
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-11 09:55:31 -08:00
05954100ab
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-11 09:55:30 -08:00
1e885d5c84
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-11 09:55:29 -08:00
bd6129fa56
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-11 09:55:28 -08:00
3ea7323532
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-03-11 09:55:28 -08:00
ddb181cb53
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-03-11 09:55:27 -08:00
8a80550731
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-03-11 09:55:26 -08:00
48b18e3fee
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-03-11 09:55:25 -08:00
ec0163c7ff
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-03-11 09:55:25 -08:00
fbc1435214
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-03-11 09:55:24 -08:00
d8fb08731e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-11 09:55:23 -08:00
b8e381d33a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-03-11 09:55:22 -08:00
cd77260339
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-03-11 09:55:22 -08:00
553463b261
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-03-11 09:55:21 -08:00
684a27611a
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-03-11 09:55:20 -08:00
c4500bebba
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-03-11 09:55:19 -08:00
3c0b90238d
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-03-11 09:55:19 -08:00
747060a2ea
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-03-11 09:55:18 -08:00
08effc0bec
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-03-11 09:55:17 -08:00
4148574b2d
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-03-11 09:55:16 -08:00
a48b62fa95
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-03-11 09:55:16 -08:00
7720159999
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-03-11 09:55:15 -08:00
4deaf5248c
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-03-11 09:55:14 -08:00
3f5b4e49ba
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-03-11 09:55:13 -08:00
c2317af86c
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-03-11 09:55:13 -08:00
4072724702
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-03-11 09:55:12 -08:00
99e94880ad
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-03-11 09:55:11 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
166355dcf0
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-10 09:54:43 -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
e7393825e4
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-09 14:19:56 -08:00
9acc9e9b20
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-09 14:19:56 -08:00
2f0a19285c
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-09 14:19:55 -08:00
8521d73733
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-09 14:19:54 -08:00
cada9b634c
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-09 14:19:53 -08:00
3bacff1e54
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-09 14:19:53 -08:00
94ff11c3e0
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-09 14:19:52 -08:00
Brian Behlendorf
Ricardo M. Correia