e530326e8f
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-11-15 16:26:48 -08:00
b57e406dd6
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-11-15 16:26:47 -08:00
00f3dfb5e9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-11-15 16:26:36 -08:00
e57bf40c98
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-11-15 16:26:36 -08:00
59cbe87375
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-15 16:26:31 -08:00
123728d9ae
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-11-15 16:26:23 -08:00
4f9acff2d8
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-11-15 16:26:20 -08:00
217998d1a3
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-11-15 16:26:12 -08:00
d8aef5d7bc
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-11-15 16:25:52 -08:00
030d49c262
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-11-15 16:25:50 -08:00
0aa61e8427
Remove zvol.c when updating in update-zfs.sh Linux version available.
2009-11-15 16:20:01 -08:00
e576375b9f
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-11-15 16:11:05 -08:00
e588ef08cb
Revert contents of linux-have-zpl topic branch.
2009-11-15 16:06:10 -08:00
d876a087ff
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-11-15 15:58:22 -08:00
b38252d3ec
Revert contents of linux-have-zvol topic branch.
2009-11-15 15:52:29 -08:00
a4fb9a97f1
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-11-12 12:55:54 -08:00
e68f100aaa
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-11-12 12:55:49 -08:00
73fe782522
Use HAVE_BDEV_LOGICAL_BLOCK_SIZE compat marco in vdev_disk.
...
This is a 2.6.31 API change.
2009-11-12 12:51:16 -08:00
564d6273e2
Mutexs will exceed 64 bytes for debug builds in 2.6.31 kernels.
...
Increase the pad size accordingly to handle this.
2009-11-12 12:45:28 -08:00
6f111fc3e6
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-27 15:03:16 -07:00
ed97b4447d
Adds the last missing block device support (merge_bdev support)
...
This change should wrap up the last of the missing block device
support in the vdev_disk layer. With this change I can now
successfully create and use zpools which are layered on top of
md and lvm virtual devices. The following changes include:
1) The big one, properly handle the case when page cannot be added
to a bio due to dynamic limitation of a merge_bdev handler. For
example the md device will limit a bio to the configured stripe
size. Our bio size may also end up being limited by the maximum
request size, and other factors determined during bio construction.
To handle all of the above cases the code has been updated to
handle failures from bio_add_page(). This had been hardcoded to
never fail for the prototype proof of concept implementation. In
the case of a failure the number of bytes which still need to be
added to a bio are returned. New bio's are allocated and attached
to the dio until the entire data buffer is mapped to bios. It is
then submitted as before to the request queue, and once all the bio's
attached to a dio have finished the completion callback is run.
2) The devid comments have been removed because it is not clear to
me that we will not need devid support. They have been replaced
with a comment explaining that udev can and should be used.
2009-10-27 14:38:38 -07:00
ef2618aff8
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-14 16:32:15 -07:00
18eee5d03f
Fix sector size and capacity calculation.
...
Remove the hard coded 512 byte SECTOR_SIZE and replace it with
bdev_hardsect_size() to get the correct hardware sector size.
Usage of get_capacity() was incorrect. We the block_device
references a partition we need to return bdev->part->nr_sects.
If get_capacity() is used the entire device size will be returned
ignoring partition information. This is however the correct thing
to do when the block device in question has not partition table.
2009-10-14 16:02:51 -07:00
5b421bb734
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-06 12:27:51 -07:00
6df0b54851
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-06 12:27:50 -07:00
bea5b8a0a2
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-06 12:27:31 -07:00
cf1bc6baa5
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-06 12:27:28 -07:00
5bc2e9e592
Add spa_config_path module option for alternate cache file.
2009-10-06 12:17:38 -07:00
73ff39b18d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-02 16:35:40 -07:00
b5b5b23cbf
Use kobject_set_name() for increased portability.
...
As of 2.6.25 kobj->k_name was replaced with kobj->name. Some distros
such as RHEL5 (2.6.18) add a patch to prevent this from being a problem
but other older distros such as SLES10 (2.6.16) have not. To avoid
the whole issue I'm updating the code to use kobject_set_name() which
does what I want and has existed all the way back to 2.6.11.
2009-10-02 16:31:23 -07:00
48cc6b6565
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-01 17:09:46 -07:00
e6359e0281
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-01 17:08:10 -07:00
3c5e68488a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-01 17:08:09 -07:00
cd01e2a6c9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:00 -07:00
ea0bf0146f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-01 17:07:58 -07:00
69bdec9913
Update to use spl_module_{init,exit}() macro API.
2009-10-01 16:49:12 -07:00
6e2c55b5a6
Update to use spl_module_{init,exit}() macro API.
2009-10-01 16:47:49 -07:00
159833d991
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-09-02 15:26:43 -07:00
c39498254d
Extra reference required for dio struct in __vdev_disk_physio.
...
Exposed by the fc11 debug kernel we need to hold a reference over all
calls to submit_bio(). Otherwise it is possible all the completion
callbacks run before we exit __vdev_disk_physio(), and we end up with
a GPF. This was quickly exposed when slab poisoning was enabled. I
have added helper functions to cleanly track the reference counts. In
addition dr->dr_ref was converted from an integer to an atomic type
which removes the need for the spinlock. As a nice side effect of
these changes the code is now slightly cleaner and clearer.
2009-09-02 15:08:40 -07:00
07dd64facf
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-18 14:22:27 -07:00
1365576b3e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-18 14:22:24 -07:00
cd710627dd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-18 14:21:47 -07:00
1c5a67a320
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-18 14:20:58 -07:00
f3f51aee8c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-18 14:20:46 -07:00
1d5a7b235b
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-18 14:20:37 -07:00
bc611acf53
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 14:20:35 -07:00
d2450a3d32
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-18 14:20:23 -07:00
431189f377
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-18 14:20:21 -07:00
623479aa05
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-18 14:20:01 -07:00
5edf1e174e
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-18 14:19:58 -07:00
ad97c53c74
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-18 14:19:57 -07:00
90f5488896
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-18 14:18:49 -07:00
147adbe815
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 14:18:40 -07:00
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
ef74bed821
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
f3ddd9d082
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-08-18 14:18:32 -07:00
8767bb3fdd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-08-18 14:18:31 -07:00
4de2019bdd
Required build 121 updates for linux-have-zvol
2009-08-18 14:11:29 -07:00
6d772ec7d2
Required build 121 updates for linux-have-zpl
2009-08-18 14:11:06 -07:00
218ddf3d52
Required build 121 updates for linux-kernel-module
2009-08-18 14:10:33 -07:00
f9a74de46a
Required build 121 updates for gcc-uninit
2009-08-18 14:09:35 -07:00
08f5b3c23d
Required build 121 updates for gcc-shadow
2009-08-18 14:09:15 -07:00
d42b88372f
Required build 121 updates for gcc-c90
2009-08-18 14:07:25 -07:00
6e43f5a80b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_ioctl.c
2009-08-18 12:59:17 -07:00
543989b909
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-18 12:35:28 -07:00
5f0eb517cf
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-18 12:34:24 -07:00
1cf9e2582c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-18 12:34:09 -07:00
b3561355b8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 12:33:54 -07:00
6a97dcc2bf
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-18 12:33:39 -07:00
7c3b0a4a2f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-18 12:33:35 -07:00
c9519311a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-18 12:33:10 -07:00
954484f75d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2009-08-18 12:32:53 -07:00
d5cfd05528
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-18 12:29:16 -07:00
c67303e092
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
8aab887b7c
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-08-18 12:10:47 -07:00
5a81224e6f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-08-18 12:10:43 -07:00
bfbac5daec
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-08-18 12:10:38 -07:00
4f6bbcd0e7
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-08-18 12:10:36 -07:00
e20ba40c91
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-08-18 12:10:02 -07:00
f8cca2b295
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-08-18 12:09:57 -07:00
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00
25ddaec292
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-08-18 12:09:07 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
abd8fdb94f
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
2009-08-18 12:08:36 -07:00
9d2ca4a4d4
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-08-18 12:07:40 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
c5b5d32d69
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/vdev_raidz.c
2009-08-18 12:06:21 -07:00
e5e4fadc34
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
0f80e41c89
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/spa_misc.c
module/zfs/vdev_label.c
2009-08-18 11:55:36 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
0803564cbe
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-04 15:58:39 -07:00
ddc0a2d4fe
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-04 15:57:58 -07:00
4b1d370e4f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-04 15:57:03 -07:00
f73936be84
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-04 15:56:50 -07:00
1bfe0d5177
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-04 15:56:36 -07:00
a089c64daa
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-04 15:56:23 -07:00
f2018fdf21
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-04 15:56:21 -07:00
a7a6539d95
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-04 15:55:57 -07:00
56204aacac
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-04 15:55:55 -07:00
74f5a110b7
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-04 15:54:35 -07:00
72fc3eca7e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 15:54:25 -07:00
f88cbd6535
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 15:54:21 -07:00
8c28ed9bff
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 15:54:19 -07:00
adcc63f658
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-04 15:54:17 -07:00
7069d048a0
Revert kthreads based on pthread thread specific data due to failure.
...
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.
(gdb) bt
0 ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1 0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
at ../../cmd/ztest/ztest.c:3862
2 0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
at ../../lib/libzpool/kernel.c:131
3 0x000000379be06367 in start_thread (arg=<value optimized out>)
at pthread_create.c:297
4 0x000000379b2d30ad in clone () from /lib64/libc.so.6
2009-08-04 15:42:24 -07:00
ca59cc5c82
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-04 14:43:29 -07:00
91960068e0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-04 14:42:49 -07:00
b324dc7fd5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-04 14:41:52 -07:00
671a2d1ed9
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-04 14:41:39 -07:00
d160703a9c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-04 14:41:26 -07:00
a58b4008c5
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-04 14:41:12 -07:00
2665b9a863
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-04 14:41:11 -07:00
37f263f244
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-04 14:40:50 -07:00
ed3e845798
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-04 14:40:48 -07:00
83a34ce138
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-04 14:39:22 -07:00
139ca4655e
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-04 14:39:11 -07:00
3e5388907b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-04 14:39:07 -07:00
9aedfd95f6
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-08-04 14:39:06 -07:00
0741d789d2
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-08-04 14:39:04 -07:00
c0ce3b40f2
Reimplement user kthreads based on pthread thread specific data.
...
This resolves previous scalabily concerns about the cost of calling
curthread which previously required a list walk. The kthread address
is now tracked as thread specific data which can be quickly returned.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-08-04 13:55:15 -07:00
a7f134832b
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-04 10:49:22 -07:00
9be5ad2924
Flag ZIO_FLAG_SPECULATIVE now issues READ instead of READA.
...
There is concern that READA may do more than simply reorder the queue.
There may be an increased chance that a requested marked READA will
fail because the elevator considers it optional. For this reason, all
read requests, even speculative ones, have been converted back to READ.
2009-08-04 10:37:40 -07:00
eeb222ffbc
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-03 16:32:23 -07:00
6dc3d8c112
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-03 16:31:47 -07:00
91229e6ba6
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-03 16:30:56 -07:00
7c2850b819
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-03 16:30:46 -07:00
51e3e70e1b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-03 16:30:36 -07:00
22f4ee3398
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-03 16:30:21 -07:00
b8e8d02bf9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-03 16:30:20 -07:00
422a321a15
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-03 16:30:04 -07:00
102ab49042
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-03 16:30:03 -07:00
315c2f8d74
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-03 16:29:00 -07:00
f2588bb208
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-03 16:28:52 -07:00
48cbfae8bd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-03 16:28:49 -07:00
f2f52087f3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-03 16:28:48 -07:00
6cb98ae6b9
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-08-03 16:28:46 -07:00
68a80a8b87
refcount_add() mistakenly moved to ASSERT() breaks --disable-debug builds.
2009-08-03 16:20:27 -07:00
14b56711dd
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-30 10:08:10 -07:00
e6e403381d
Revert remaining unneeded change so the topic branch can be removed.
2009-07-30 09:59:31 -07:00
dbee607bbd
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-29 21:31:26 -07:00
a30f6a4b73
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-29 21:30:48 -07:00
0c78bb26e7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-29 21:29:53 -07:00
6c00d99d48
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-29 21:29:41 -07:00
9cdb618921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-29 21:29:28 -07:00
833c4d1d74
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-29 21:29:16 -07:00
db9f4d423b
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-29 21:29:15 -07:00
7abfa06507
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-29 21:28:55 -07:00
4f6e1daa09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-29 21:28:53 -07:00
188e448793
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-29 21:27:40 -07:00
640e02d051
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-29 21:27:17 -07:00
0d5745b290
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-29 21:27:14 -07:00
2d86fb2788
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-29 21:27:13 -07:00
3185bb677e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-29 21:27:12 -07:00
653cd5153a
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-07-29 21:27:10 -07:00
ee435f260c
Excessively large stack frames detected.
...
The 2.6.30 kernel build systems sets -Wframe-larger-than=2048 which causes
a warning to be generated when an individual stack frame exceeds 2048.
This caught the spa_history_log() and dmu_objset_snapshot() functions
which declared a data structure on the stack which contained a char
array of MAXPATHLEN. This in defined to be 4096 in the linux kernel
and I imagine it is quite large under Solaris as well. Regardless, the
offending data structures were moved to the heap to correctly keep the
stack depth to a minimum. We might consider setting this value even
lower to catch additional offenders because we are expecting deep stacks.
2009-07-29 21:18:48 -07:00
2b54211968
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-29 17:51:33 -07:00
4014bd401f
Major vdev_disk feature and API (thru 2.6.30) update.
...
Tested under CHAOS4.2, RHEL5, SLES11, and FC11 (all x86_64)
Features:
Honor spa_mode() when opening the block device. Previously this
was ignored and devices were always opened read/write.
Integrated DKIOCFLUSHWRITECACHE zio operation with linux WRITE_BARRIER
for kernels post 2.6.24 where empty bio requests are supported. For
earlier kernels ENOTSUP is returned and no barriers are performed. If
RHEL5 based kernels are intended to be supported long term we may need
make use of the old akward API.
With the addition of WRITE_BARRIER support all writes which were
WRITE_SYNC can now be safely made WRITE bios. They will now take
advantage of aggregation in the elevator and improved write performance
is likely.
Notice the ZIO_FLAG_SPECULATIVE flag and pass along the hint to the
elevator by using READA instead of READ. This provides the elevator
the ability to prioritize the real READs ahead of the speculative IO
if needed.
Implement an initial version of vdev_disk_io_done() which in the case
of an EIO error triggers a media change check. If it determines a
media change has occured we fail the device and remove it from the
config. This logic I'm sure can be improved further but for now it
is an improvement over the VERIFY() that no error will ever happen.
APIs:
2.6.22 API change
Unused destroy_dirty_buffers arg removed from prototype.
2.6.24 API change
Empty write barriers are now supported and we should use them.
2.6.24 API change
Size argument dropped from bio_endio and bi_end_io, because the
bi_end_io is only called once now when the request is complete.
There is no longer any need for a size argument. This also means
that partial IO's are no longer possibe and the end_io callback
should not check bi->bi_size. Finally, the return type was updated
to void.
2.6.28 API change
open/close_bdev_excl() renamed to open/close_bdev_exclusive().
2.6.29 API change
BIO_RW_SYNC renamed to BIO_RW_SYNCIO.
2009-07-29 17:24:08 -07:00
0de6354acc
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-24 15:32:03 -07:00
1fc5fb504c
BIO_RW_FAILFAST replaced with BIO_RW_FAILFAST_{DEV|_TRANSPORT|_DRIVER}
...
Use the legacy BIO_RW_FAILFAST flag if it exists. If it is missing it
means we are running against a kernel with the newer API. We should
be able to enable some fairly smart behavior one we intergrate with the
new API, but until I get around to writing that code just remove the
flag entirely. It's not critical for correctness.
2009-07-24 15:16:13 -07:00
67d31d626f
The bi_end_io API changes make partial IO's impossible
...
Kernel commit 6712ecf8f648118c3363c142196418f89a510b90 which removes the
size argument from bio_endio and bi_end_io, also removes the need to
handle partial IOs in the handler.
2009-07-24 15:08:09 -07:00
e63baa3490
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-21 11:36:33 -07:00
41c17d43e3
Update to spl device interfaces for portability.
...
- Linux specific character device registration calls replaced with
the spl version for maximum portability between linux kernels.
- Added ZPIOS_NAME macro.
2009-07-21 11:26:53 -07:00
6af0c921a6
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-07-21 10:35:24 -07:00
43ad6bb2ad
Register compat ioctl handlers for zpios + 32-bit safe timespec.
...
A compat ioctl handler for zpios was added which simply passes the
ioctl on to the usual handler. The IOWR macro's correctly handle
this. Additionally replace the use of 'struct timespec' which uses
longs internally and is therefore different sizes on 32-bit vs 64-bit
objects with 'struct zpios_timespec_t'. This custom structure uses
uint32_t types internally and is safe to pass through an ioctl. The
helper functions for this new type were also moved to a common place
so they may be used safely by the user or kernel code.
2009-07-21 10:22:47 -07:00
3b65f6fab8
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-14 14:39:38 -07:00
24f65b670e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-14 14:38:54 -07:00
a53cbbfb0e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-14 14:37:55 -07:00
9ac0bce002
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-14 14:37:35 -07:00
477c7a7281
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-14 14:37:21 -07:00
998d11b698
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-14 14:37:05 -07:00
438a7e63e9
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-14 14:37:03 -07:00
3574c3ff42
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-14 14:36:38 -07:00
4727a58497
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-14 14:36:36 -07:00
3e3d9c9139
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-14 14:35:13 -07:00
8121895a61
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-14 14:34:44 -07:00
1abe2b0b12
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-14 14:34:40 -07:00
fef9a2c571
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-14 14:34:39 -07:00
9b9f17a585
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-14 14:34:37 -07:00
605a501311
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-14 14:34:35 -07:00
864e44e7e0
Provide correct kthread API semantics using pthreads.
...
The intent here is to fully remove the previous Solaris thread
implementation so we don't need to simulate both Solaris kernel
and user space thread APIs. The few user space consumers of the
thread API have been updated to use the kthread API. In order
to support this we needed to more fully support the kthread API
and that means not doing crazy things like casting a thread id
to a pointer and using that as was done before. This first
implementation is not effecient but it does provide all the
corrent semantics. If/when performance becomes and issue we
can and should just natively adopt pthreads which is portable.
Let me finish by saying I'm not proud of any of this and I would
love to see it improved. However, this slow implementation does
at least provide all the correct kthread API semantics whereas
the previous method of casting the thread ID to a pointer was
dodgy at best.
2009-07-14 14:16:26 -07:00
62806e60d6
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-07-10 11:51:14 -07:00
91fcf9d661
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-10 11:51:11 -07:00
9ffbe8f428
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-10 11:51:09 -07:00
d3cb195b31
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-10 11:50:50 -07:00
b46157da8c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-10 11:50:46 -07:00
8a5b47ebb5
Add dmu_write_impl() prototype needed by zpios until a clean
...
zerocopy interface is available.
2009-07-10 11:39:37 -07:00
8bb9b8305a
Export new quota related symbols.
2009-07-10 11:38:53 -07:00
33eec3513e
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-10 10:55:07 -07:00
452ebd84b7
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-10 10:55:04 -07:00
0d4deb4760
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-10 10:54:18 -07:00
d97f750686
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-10 10:53:18 -07:00
bb9e6cc882
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-10 10:53:05 -07:00
f1ec04e192
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-10 10:52:50 -07:00
925fa57107
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-10 10:52:37 -07:00
df59544928
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-10 10:52:36 -07:00
e5d6b866f7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-10 10:52:13 -07:00
ca2e8a0a7f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-10 10:52:11 -07:00
da907f8c39
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-10 10:50:45 -07:00
37e6d3e769
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-10 10:50:18 -07:00
b4a5983ebf
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-10 10:50:15 -07:00
4baa59ce44
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-10 10:50:13 -07:00
cfec48619c
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-10 10:50:12 -07:00
84b52133f3
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-10 10:50:10 -07:00
f3c55459b0
Pull ; in to macro to ensure it get's entirely removed, C90 issue.
2009-07-10 10:40:55 -07:00
ec3045dcf2
Refine HAVE_ZPL checks after b117 update.
2009-07-10 10:39:44 -07:00
0c390c6de4
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 15:12:29 -07:00
0539df32a1
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 15:11:47 -07:00
f652333485
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 15:10:53 -07:00
9056388e75
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 15:10:39 -07:00
f9111d6e11
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 15:10:26 -07:00
bfcab44eb7
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 15:10:14 -07:00
2ec527b793
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 15:10:12 -07:00
ac47fd1d1f
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 15:09:51 -07:00
f8938a398f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 15:09:50 -07:00
195c942213
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 15:08:34 -07:00
791241dfb0
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 15:08:11 -07:00
7211f81057
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 15:08:07 -07:00
24662d61d9
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 15:08:06 -07:00
2f4e745a09
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 15:08:04 -07:00
bed14af385
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-07-09 15:08:03 -07:00
ae132945b4
Add suggested paranthesis.
2009-07-09 14:59:10 -07:00
f13edd3084
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-07-09 14:20:38 -07:00
8a849a66fe
Wrap all the ACL interfaces for now with HAVE_ZPL. They are integrated
...
with the vfs layer which is not at all supported yet.
2009-07-09 14:11:13 -07:00
99880c2dc1
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 13:22:09 -07:00
a3a9c56aa1
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 13:21:25 -07:00
b11df77db9
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 13:20:27 -07:00
8fba9a5957
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 13:20:09 -07:00
8129849f84
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 13:19:55 -07:00
f99ad7f4c3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 13:19:41 -07:00
ebb013f2dd
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 13:19:39 -07:00
176ce8248a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 13:19:17 -07:00
db193d4ca9
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 13:19:15 -07:00
029949d7c2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 13:17:56 -07:00
5b606597a8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 13:17:32 -07:00
617385b6f2
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 13:17:28 -07:00
17d368fa5f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 13:17:27 -07:00
a3bc97c2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 13:17:26 -07:00
9ad0fef49e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
683b2f0d00
TopGit missed this update when I updated the same line in the
...
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'. I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
e05c1f7986
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 12:28:29 -07:00
af0e394f1e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 12:27:45 -07:00
a88f5d6ce7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 12:26:43 -07:00
b759d9db89
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 12:26:29 -07:00
5fb58ec621
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 12:26:14 -07:00
7f3ee7a5ef
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 12:26:00 -07:00
e945770943
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 12:25:58 -07:00
8551a101ea
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 12:25:34 -07:00
0c3f631b72
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 12:25:32 -07:00
8c3ccc7099
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 12:24:12 -07:00
999f693b85
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 12:23:46 -07:00
1708d28097
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 12:23:43 -07:00
c4c4afd8fd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 12:23:41 -07:00
6db8882b78
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 12:23:39 -07:00
76bf02aebb
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-07-09 12:23:36 -07:00
a551134b2f
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:14:56 -07:00
a19906fe65
Unitialized variables should be handled in the gcc-uninit topic branch.
2009-07-09 12:13:56 -07:00
f1d99c0653
Revert to original debugging code and wrap any variabled used only
...
within an ASSERT with the ASSERTV macro which will ensure it will
be removed when the ASSERTs are commented out. This makes gcc much
happier, makes the variables usage explicit, and removes the need
for the compiler to detect it is unused and do the right thing.
2009-07-09 12:10:52 -07:00
2ed7001286
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-09 10:44:11 -07:00
38d7e6d061
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-09 10:43:29 -07:00
5e10258e65
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-09 10:42:35 -07:00
2d4fa0b507
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-07-09 10:42:25 -07:00
e91a439720
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-09 10:42:21 -07:00
7120b27f27
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-09 10:42:09 -07:00
2018d0e610
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-09 10:41:54 -07:00
7a724b1db0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-09 10:41:53 -07:00
19e8f65be3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-09 10:41:31 -07:00
64e827d295
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-09 10:41:30 -07:00
d8a401bacb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-09 10:40:13 -07:00
149eea21db
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-09 10:39:49 -07:00
a8d32ac1e2
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-09 10:39:46 -07:00
e5e94c40f7
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-09 10:39:44 -07:00
aa8ed32ee8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-09 10:39:43 -07:00
9e394e10a9
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-09 10:39:41 -07:00
2cc278c96f
This change looks to have been made due to Sun bug 6803822, but
...
it's not exactly clear to me why. Regardless I'm taking it.
2009-07-09 10:30:06 -07:00
43af29de5f
Type int accidentally not declared at the top of the function.
2009-07-09 10:19:02 -07:00
4d410127b0
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-09 08:49:29 -07:00
cc6e67fa7f
Wrap sysevent includes until sysevent or something like it is implemented.
2009-07-09 08:40:33 -07:00
b12e8eb702
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-08 09:20:37 -07:00
cfa46b4440
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-08 09:19:57 -07:00
1ef0da1c7b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-08 09:19:03 -07:00
6e1c4e5bd6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-07-08 09:18:45 -07:00
e2e3b40ef9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-08 09:18:32 -07:00
0d73002d8d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-07-08 09:18:20 -07:00
1e0e588128
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-07-08 09:18:18 -07:00
2aa22c1ccb
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-07-08 09:17:53 -07:00
1355255010
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-08 09:17:52 -07:00
368436bb83
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-07-08 09:16:33 -07:00
affa4ec536
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 09:16:10 -07:00
aa636ae442
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-07-08 09:16:07 -07:00
33077ad631
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 09:16:05 -07:00
f00e6fe5c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-08 09:16:04 -07:00
5fc46112cb
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-07-08 09:16:01 -07:00
58f5e63293
Resolve a 2 new cases of for loop variable declared in for()
2009-07-08 09:05:37 -07:00
28718acdab
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-07 17:13:35 -07:00
756d013735
Disable autoexpand notifing sysevent which is not supported.
2009-07-07 17:06:27 -07:00
85f46e8651
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 16:35:05 -07:00
dd1e80c3c5
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-07 16:34:26 -07:00
dc5a90a00d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-07-07 16:33:35 -07:00
Brian Behlendorf
Ricardo M. Correia