ea1f909ba2
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-23 12:26:56 -07:00
561015d399
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-23 12:26:54 -07:00
e61024445b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-23 12:26:49 -07:00
b84f236a38
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-23 12:26:47 -07:00
a56b8d337f
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zfs/zfs_main.c
2009-10-23 12:25:33 -07:00
74b67983f1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-23 12:24:39 -07:00
8d3be9d6b8
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-23 12:24:39 -07:00
edb22b6a3e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-23 12:24:38 -07:00
53fcde4a48
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-23 12:24:37 -07:00
d8d360724d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-10-23 12:24:37 -07:00
5972702242
Add two more possible uninit vars flagged by gcc.
2009-10-23 11:43:09 -07:00
a9db62de88
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:40 -07:00
7f36c8649f
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-21 12:04:39 -07:00
75d3938961
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:36 -07:00
89639638d6
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-21 12:04:36 -07:00
bfddec1957
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:33 -07:00
8545c1c447
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-21 12:04:32 -07:00
42ac9f4511
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:29 -07:00
22e096636f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-21 12:04:28 -07:00
d3f63b9657
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:26 -07:00
151bb2689e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-21 12:04:25 -07:00
8513e824a0
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:22 -07:00
b1d8d8fef9
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-21 12:04:21 -07:00
e0e0bac5a6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:19 -07:00
6367f93602
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-21 12:04:18 -07:00
c9e138c366
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:15 -07:00
044a19c1bf
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-21 12:04:14 -07:00
f1f05eacf1
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:11 -07:00
cbe8cd5465
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-21 12:04:11 -07:00
99a081f0f7
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:08 -07:00
3e32c771b0
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-21 12:04:07 -07:00
deaca125bd
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:04 -07:00
7dc8d8e947
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-21 12:04:03 -07:00
f0aac45aa5
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-21 12:04:01 -07:00
cdc0778635
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-21 12:04:00 -07:00
334a724a7e
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-21 12:03:57 -07:00
48de801585
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-21 12:03:56 -07:00
ef5bfc4d4a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-21 12:03:56 -07:00
9bf7fa8c84
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-21 12:03:50 -07:00
29134090dd
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-21 12:03:50 -07:00
fffe302a32
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-21 12:03:49 -07:00
845e4b1e91
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-21 12:03:44 -07:00
c6127f0065
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-21 12:03:43 -07:00
7a065a41fc
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-21 12:03:40 -07:00
a8542a9376
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-21 12:03:39 -07:00
6f5139fab9
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-21 12:03:37 -07:00
299e7c585e
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-21 12:03:36 -07:00
b2f7632187
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-21 12:03:33 -07:00
b5d2e2fc71
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-21 12:03:32 -07:00
aec988734b
Command 'zpool create' needs to wait on correct partition names.
...
When creating partition tables we always need to wait until not
only the /dev/<disk><part> device appears. But just as importantly
if we were originally given a udev path we need to wait for the
/dev/disk/*/<name>-part<part> symlink to be created. However,
since the partition naming convention differs between /dev/ and
/dev/disk we determine based on the path which convention to
expect and then wait (for a few seconds) for the device to be
created. Based on my experience with udev on my test nodes it
takes about 300ms for the devices to be created after being
prompted by the kernel. This time will vary somehwat based
on how complicated your udev rules are, so for safety I threw
in a factor of 10. We wait 3 seconds for the devices to appears
before erroring out with a failure.
An additional minor fix includes checking the force flag in the
EFI_GPT_PRIMARY_CORRUPT case. This allows you to force the
update even in the corrupt partition case.
Finally, since these are Linux only changes I've dropped the
devid code entirely here because I still can't think of why we
would need or want it on a Linux system.
2009-10-21 11:50:42 -07:00
Brian Behlendorf