1ab332ecf7
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-04-23 11:09:02 -07:00
66b756d253
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-04-23 11:09:00 -07:00
aafdbe5d6e
Check all partitions with check_file() even when no libblkid is found
...
When creating a new pool on a block device we need to check all the
partitions even if we don't have liblkdid support. In this case
we can't consult the blkid cache but we still can call check_file()
and attempt to read a valid label from each partition.
Additionally, the O_EXCL flag was removed because the device will
be opened multiple times and this was causing the check the file.
The device is only opened read-only anyway so this is still safe.
$ sudo zpool create tank /dev/sdz
invalid vdev specification
use '-f' to override the following errors:
/dev/sdz1 is part of potentially active pool 'tank'
2010-04-23 10:59:31 -07:00
80f7e637f5
Refresh autogen products
2010-04-22 10:06:46 -07:00
753d533ed4
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-04-22 10:02:29 -07:00
0cd0c7edba
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-04-22 10:02:28 -07:00
685467d41c
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-04-22 10:02:27 -07:00
50c053bda2
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-04-22 10:02:25 -07:00
7e67892354
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-04-22 10:02:18 -07:00
d7fe13d172
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-04-22 10:02:17 -07:00
5fcefff3bf
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-04-22 10:02:09 -07:00
3b5557a669
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-04-22 10:02:07 -07:00
473024f037
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-04-22 10:02:00 -07:00
d4d663a4f6
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-04-22 10:01:58 -07:00
4d34ad7358
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-04-22 10:01:51 -07:00
1d30e61982
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-04-22 10:01:49 -07:00
acc53e4b8f
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-04-22 10:01:42 -07:00
6ddf68bb1e
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-04-22 10:01:40 -07:00
5b225973b2
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-04-22 10:01:33 -07:00
9aa17abb34
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-04-22 10:01:31 -07:00
a29e0fc964
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2010-04-22 10:01:24 -07:00
b28a3fa199
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2010-04-22 10:01:22 -07:00
1db7d0ceaa
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-04-22 10:01:14 -07:00
d3b82a5ddc
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-04-22 10:01:12 -07:00
ea408417c1
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-04-22 10:01:05 -07:00
68cf0243af
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-22 10:01:03 -07:00
6a22ba1f1a
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-04-22 10:00:56 -07:00
64d1e4e3e6
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-04-22 10:00:54 -07:00
4f56f2f679
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-04-22 10:00:54 -07:00
ab00d10082
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-04-22 10:00:40 -07:00
4ef7e7616a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-04-22 10:00:38 -07:00
7ba23e898d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-04-22 10:00:31 -07:00
68b9ebef07
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-04-22 10:00:29 -07:00
2ba9b092c2
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-04-22 10:00:22 -07:00
9e92c5f137
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-04-22 10:00:20 -07:00
53f5636918
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-04-22 10:00:13 -07:00
165e7afab8
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2010-04-22 10:00:11 -07:00
d69cfcab40
Add top level SPL include path which is needed for *-devel builds
2010-04-22 09:55:07 -07:00
34edbcd956
Refresh autogen products
2010-03-26 15:57:19 -07:00
5b09380297
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
...
Conflicts:
config/Rules.am
2010-03-26 15:52:42 -07:00
409916a9ac
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-03-26 15:49:57 -07:00
10486210ac
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-03-26 15:49:56 -07:00
da393c2bda
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-03-26 15:49:55 -07:00
cb0002eb96
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-03-26 15:49:48 -07:00
fad6045aef
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-03-26 15:49:46 -07:00
054337134a
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-03-26 15:49:39 -07:00
52f3ce51c1
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-03-26 15:49:37 -07:00
f93bbfa33f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-03-26 15:49:30 -07:00
d6a0475275
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-03-26 15:49:28 -07:00
2b04a643e3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-03-26 15:49:20 -07:00
Brian Behlendorf