Brian Behlendorf
95e5d1c43d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:08 -08:00
Brian Behlendorf
b6192dfa2c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-03-11 09:55:07 -08:00
Brian Behlendorf
e1b58e733e
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-03-11 09:55:07 -08:00
Brian Behlendorf
d6b678d2c2
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-03-11 09:55:05 -08:00
Brian Behlendorf
b5690a43d2
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-03-11 09:55:04 -08:00
Brian Behlendorf
c919132283
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-03-11 09:55:03 -08:00
Brian Behlendorf
ba3c8033fc
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-03-11 09:55:01 -08:00
Brian Behlendorf
d7e292c232
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-03-11 09:55:01 -08:00
Brian Behlendorf
2ec833a7a6
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-03-11 09:54:59 -08:00
Brian Behlendorf
ad2c4c94ae
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-03-11 09:54:58 -08:00
Brian Behlendorf
91f88418df
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-03-11 09:54:56 -08:00
Brian Behlendorf
cf4d8c2bbf
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-11 09:54:55 -08:00
Brian Behlendorf
a4746edfe6
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-03-11 09:54:53 -08:00
Brian Behlendorf
a35120184e
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-03-11 09:54:52 -08:00
Brian Behlendorf
d0a943ea19
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-03-11 09:54:51 -08:00
Brian Behlendorf
61e9ef444e
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-03-11 09:54:50 -08:00
Brian Behlendorf
3b66b55e8c
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-03-11 09:54:48 -08:00
Brian Behlendorf
deb3da4ad0
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-03-11 09:54:47 -08:00
Brian Behlendorf
8731b6820d
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-03-11 09:54:45 -08:00
Brian Behlendorf
04f739ff61
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-03-11 09:54:44 -08:00
Brian Behlendorf
2f658d8154
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-03-11 09:54:42 -08:00
Brian Behlendorf
c007de17e9
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-03-11 09:54:41 -08:00
Brian Behlendorf
ca936ff085
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-11 09:54:40 -08:00
Brian Behlendorf
5389e96149
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-11 09:54:39 -08:00
Brian Behlendorf
ce96c77fa4
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-11 09:54:37 -08:00
Brian Behlendorf
14e1411b39
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-11 09:54:36 -08:00
Brian Behlendorf
931ed94a98
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-11 09:54:35 -08:00
Brian Behlendorf
ad1bc6c745
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-11 09:54:34 -08:00
Brian Behlendorf
a579a4ec00
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-11 09:54:32 -08:00
Brian Behlendorf
5b949f90fa
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-11 09:54:31 -08:00
Brian Behlendorf
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -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
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