91f88418df
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-03-11 09:54:56 -08:00
cf4d8c2bbf
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-03-11 09:54:55 -08:00
a4746edfe6
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-03-11 09:54:53 -08:00
a35120184e
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-03-11 09:54:52 -08:00
d0a943ea19
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-03-11 09:54:51 -08:00
61e9ef444e
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-03-11 09:54:50 -08:00
3b66b55e8c
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-03-11 09:54:48 -08:00
deb3da4ad0
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-03-11 09:54:47 -08:00
8731b6820d
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-03-11 09:54:45 -08:00
04f739ff61
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-03-11 09:54:44 -08:00
2f658d8154
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-03-11 09:54:42 -08:00
c007de17e9
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-03-11 09:54:41 -08:00
ca936ff085
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-03-11 09:54:40 -08:00
5389e96149
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-03-11 09:54:39 -08:00
ce96c77fa4
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-03-11 09:54:37 -08:00
14e1411b39
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-03-11 09:54:36 -08:00
931ed94a98
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-03-11 09:54:35 -08:00
ad1bc6c745
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-03-11 09:54:34 -08:00
a579a4ec00
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-03-11 09:54:32 -08:00
5b949f90fa
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-03-11 09:54:31 -08:00
414f1f975e
Rename update-zfs.sh -> zfs-update.sh for consistency
2010-03-11 09:53:59 -08:00
369293803b
Allow recursive configure/make
...
Previously the ZFS configure was dependent on a correct Module{s}.symvers
file which is generated as one of the last steps of the full SPL build.
This meant you could not do a recursive configure because this will
configure all sub-packages before building any of them.
To resolve this issue the ZFS code has been updated to make a very
educated guess as to this file name at configure time. This means
SPL_SYMBOLS may still be used in various places in the build system
such as modules/Makefile.in. But we do give up the ability to
seemlessly detect symbols exported by the SPL at ZFS configure time.
At the moment this is not as issue, hopefully it will stay that way.
2010-03-11 09:45:23 -08:00
20894b4487
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-10 12:09:33 -08:00
c7c19c1259
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-10 12:09:32 -08:00
2c79a2fa6a
Fix a few zdb bugs when trying to open a pool
...
Specifically, the following bugs are fixed in this patch:
1) zdb wasn't getting the correct device size when the vdev is a
block device. In Solaris, fstat64() returns the device size but
in Linux an ioctl() is needed.
2) We were opening block devices with O_DIRECT, which caused pread64()
to fail with EINVAL due to memory alignment issues. This was fixed by
the previous umem cache alignment fix in stub implementation to align
objects correctly. But we still needed to add a check for the error here.
3) We also make sure that we don't try to open a block device in write
mode in userspace. This shouldn't happen, because zdb opens devices
in read-only mode, and ztest only uses files.
2010-03-10 12:03:48 -08:00
c557557e4a
Add umem_alloc_aligned() and honor cache_align field for umem caches
...
Under linux we open block devices with O_DIRECT which means we must
provide aligned memory buffers. This patch adds the needed umem
interfaces or in the case of caches simply honors alignment provided
at cache creation time.
2010-03-10 11:51:43 -08:00
9c0d97face
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:51 -08:00
b02716b3d7
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-10 09:59:49 -08:00
9eccf857fc
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:44 -08:00
69833fb0bb
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-10 09:59:42 -08:00
b646d93620
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:37 -08:00
b47f6b7691
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-10 09:59:35 -08:00
7dbaeb671d
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:30 -08:00
3670186d0a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-10 09:59:28 -08:00
85a710a0da
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:23 -08:00
8e62815eea
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-10 09:59:21 -08:00
df3aa8242b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:16 -08:00
1186ea3781
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-03-10 09:59:14 -08:00
1a2b64653a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:09 -08:00
8dce5973eb
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-03-10 09:59:07 -08:00
c2037c0c27
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-03-10 09:59:02 -08:00
211edca1cc
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-03-10 09:59:00 -08:00
4dc7d1aceb
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-10 09:58:55 -08:00
eb99e5706b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-10 09:58:52 -08:00
138931f868
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-10 09:58:47 -08:00
90c4f99e36
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-10 09:58:45 -08:00
bb21b58943
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-10 09:58:40 -08:00
724a450233
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-10 09:58:38 -08:00
c1c14c18c8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-10 09:58:37 -08:00
37f7c0842f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-03-10 09:58:28 -08:00
Brian Behlendorf
Ricardo M. Correia