1a6447c024
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-22 16:56:32 -07:00
38b6b00574
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-22 16:56:30 -07:00
5b14d2ab2f
Move zfs_config.h include to command line -include
...
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
2010-03-22 16:50:58 -07:00
c9aaaff23b
Move zfs_config.h include to command line -include
...
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
are always available.
2010-03-22 16:48:16 -07:00
f04c01c945
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-03-09 13:53:21 -08:00
ba0a56bb2a
Fix struct ht_lock padding in arc.c.
...
This was leading to a compilation error because in Linux, sizeof
(kmutex_t) can be larger than 64 in some circumstances (e.g. with
debugging and lockdep enabled).
The code was previously fixed to align the structure to 256 bytes,
but a better fix is to align it to the next multiple of 64 bytes.
2010-03-09 13:49:36 -08:00
4198550b18
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 13:25:42 -08:00
e5fd6fb97f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 13:25:16 -08:00
f134f893c1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 13:25:09 -08:00
c0485b7731
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 13:25:02 -08:00
759c1e4f99
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 13:25:02 -08:00
89f4f4a695
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 13:24:37 -08:00
6c0502f5a6
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 13:24:32 -08:00
19eef8ad39
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 13:24:30 -08:00
9fa502c50b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-09 13:24:29 -08:00
e218fd13e8
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-09 13:24:28 -08:00
ef359aee66
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-09 13:24:27 -08:00
f2ab1fea36
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-09 13:24:27 -08:00
2b85024275
Use CPU percentages for number of commit cb threads.
...
This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).
2010-03-09 13:21:20 -08:00
3ea63f0cdb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 12:31:25 -08:00
eda82c813d
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 12:30:57 -08:00
3ea409cfce
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 12:30:50 -08:00
feac56bf5a
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 12:30:44 -08:00
17a96f44f3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 12:30:43 -08:00
573328741b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2010-03-09 12:30:21 -08:00
324bb92af5
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 12:30:19 -08:00
8f63d438cd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-09 12:30:18 -08:00
48e74ed68b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
9a3d5378c6
Clean up emulation of kernel threads in userspace.
...
Updated to use pthread thread specific data rather than keeping
a global list. This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
49f514aabb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-09 10:31:33 -08:00
4d0e16b4a8
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-09 10:31:05 -08:00
4aec8c8fe5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-09 10:30:58 -08:00
0d3d0d9497
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-09 10:30:51 -08:00
bbb9ce3401
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-09 10:30:50 -08:00
f3aec3d1eb
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-09 10:30:26 -08:00
e760d8d950
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-09 10:30:21 -08:00
3a9850385c
Include all headers regardless of depth
...
The previous hack for this was to move headers 3 levels deep in to
the top level include dir and headers 4 levels deep in to sys.
Obviously this was fairly limiting and missed two important headers.
./zfs/include/sys/fm/fs/zfs.h
./zfs/include/sys/fs/zfs.h
This patch updates the code to be smarter and installs all the headers
to the correct location regardless of depth. Each header will have its
leading 3 path args stripped (i.e. ./zfs/include/) and replaced with
the correct install destination. All path information past the first
three levels will be preserved.
2010-03-09 10:20:34 -08:00
16cc96a13f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-03-08 13:48:38 -08:00
aed42f2444
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-03-08 13:48:23 -08:00
b87bc94fb0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-08 13:48:19 -08:00
7be37fe5f3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 13:48:16 -08:00
9974a98a5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-03-08 13:48:15 -08:00
5f51cdd50a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-03-08 13:48:02 -08:00
6dffc18479
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-03-08 13:47:59 -08:00
3d7cfde000
Remove Module.markers and Module.symver{s} in clean target
...
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
ed3451bd03
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:47 -08:00
5f863d5936
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2010-03-08 10:51:39 -08:00
df688225a3
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-03-08 10:51:37 -08:00
4dbd1e59e5
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-disk topic branch, see commit fd75782
2010-03-08 10:47:55 -08:00
7121867aea
Configure checks for kernel build options incompatible with the license
...
Changes for linux-kernel-module topic branch, see commit fd75782
2010-03-08 10:45:19 -08:00
efc3e7a375
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-01-08 11:40:18 -08:00
6037f5f124
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-01-08 11:40:01 -08:00
e4a4e686cd
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-01-08 11:39:56 -08:00
237341f2ce
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2010-01-08 11:39:52 -08:00
39d8b611e3
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-01-08 11:39:52 -08:00
63a3d1f7b9
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2010-01-08 11:39:35 -08:00
889f0e5e30
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2010-01-08 11:39:32 -08:00
303d9f010d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-01-08 11:39:31 -08:00
710e779a08
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-01-08 11:39:30 -08:00
a240c39095
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-01-08 11:39:29 -08:00
ee3aa7773b
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-01-08 11:39:28 -08:00
eaf2e3231c
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-01-08 11:39:28 -08:00
6cb71e1dec
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-01-08 11:39:14 -08:00
e6f83f6a79
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-01-08 11:39:11 -08:00
69804965e9
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-01-08 11:39:00 -08:00
e69572c1b5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-01-08 11:39:00 -08:00
4cd8e49a69
Add .gitignore files to exclude build products
2010-01-08 11:35:17 -08:00
821cec7046
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-12-23 14:50:47 -08:00
9345a0c1a0
Using autoconf check define fmode_t typedef if undefined.
2009-12-23 14:45:04 -08:00
cbafee6ff0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-18 14:32:29 -08:00
25ecf0dd97
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-12-18 14:32:05 -08:00
05952b960d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-12-18 14:31:58 -08:00
08571cee27
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-12-18 14:31:51 -08:00
5b0a1c06d5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-12-18 14:31:51 -08:00
fcdc7ae52d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-12-18 14:31:30 -08:00
8ffe347acc
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-12-18 14:31:23 -08:00
93b5403a64
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-12-18 14:31:22 -08:00
1a36b0ada1
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-18 14:31:22 -08:00
b58747a2e2
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-12-18 14:31:21 -08:00
70ddc1393f
No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
...
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called. Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
86debac4c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-12-11 12:08:43 -08:00
7b8fbda25b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-12-11 12:08:13 -08:00
f73c310efd
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-12-11 12:08:08 -08:00
4e7da53a39
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-12-11 12:08:06 -08:00
57e0171065
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-12-11 12:07:58 -08:00
8bc41ddf2e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-12-11 12:07:58 -08:00
2b8880572a
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-12-11 12:07:31 -08:00
52fbfecea5
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-12-11 12:07:26 -08:00
acd798cfd4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 12:07:23 -08:00
f8d093f69b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 12:07:23 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
f76a6daca5
Use check_disk_change() instead of revalidate_disk().
...
For 2.6.27 kernels are earlier revalidate_disk() was not available.
However, check_disk_change() has been available for far longer and
will properly inform the kernel of the volume change for both older
and newer kernels.
2009-12-11 12:02:45 -08:00
0dad9b2f9a
Adding missed * in debug ASSERT.
2009-12-11 12:02:05 -08:00
8f1eb1049b
Use MAXOFFSET_T instead of SPEC_MAXOFFSET_T for 32-bit arch.
2009-12-11 12:01:16 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
45a5551a0e
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/zfs_ioctl.c
2009-11-20 12:11:23 -08:00
fb1b00e9f4
Linux ZVOL implementation; kernel-side changes
...
At last a useful user space interface for the Linux ZFS port arrives.
With the addition of the ZVOL real ZFS based block devices are available
and can be compared head to head with Linux's MD and LVM block drivers.
The Linux ZVOL has not yet had any performance work done but from a user
perspective it should be functionally complete and behave like any other
Linux block device.
The ZVOL has so far been tested using zconfig.sh on the following x86_64
based platforms: FC11, CHAOS4, RHEL5, RHEL6, and SLES11. However, more
testing is required to ensure everything is working as designed.
What follows in a somewhat detailed list of changes includes in this
commit to make ZVOL's possible. A few other issues were addressed in
the context of these changes which will also be mentioned.
* Added module/zfs/zvol.c which is based off the original Solaris ZVOL
implementation but rewritten to intergrate with the Linux block device
APIs. The basic design remains the similar in Linux with the major
change being request processing. Request processing is handled by
registering a request function which the elevator calls once all request
merges is finished and the elevator unplugs. This function is called
under a spin lock and the request structure is passed to the block driver
to be queued for IO. The elevator must be notified asyncronously once
the request completes or fails with an error. This allows us the block
driver a chance to handle many request concurrently. For the ZVOL we
maintain a taskq with a service thread per core. As requests are delivered
by the elevator each request is dispatched to the taskq. The task queue
handles each request with a write or read helper function which basically
copies the request data in to our out of the DMU object. Writes single
completion as soon as the DMU has the data unless they are marked sync.
Reads are all handled syncronously however the elevator will merge many
small reads in to a large read before it submitting the request.
* Cachine is worth specifically mentioning. Because both the Linux VFS
and the ZFS ARC both want to fully manage the cache we unfortunately
end up with two caches. This means our memory foot print is larger
than otherwise expected, and it means we have an extra copy between
the caches, but it does not impact correctness. All syncs are barrior
requests I believe are handled correctly. Longer term there is lots of
room for improvement here but it will require fairly extensive changes
to either the Linux VFS and VM layer, or additional DMU interfaces to
handle managing buffer not directly allocated by the ARC.
* Added module/zfs/include/sys/blkdev.h which contains all the Linux
compatibility foo which is required to handle changes in the Linux block
APIs from 2.6.18 thru 2.6.31 based kernels.
* The dmu_{read,write}_uio interfaces which don't make sense on Linux
have been modified to dmu_{read,write}_req functions which consume the
standard Linux IO request structure. Their function fundamentally
remains the same so this happily worked out pretty cleanly.
* The /dev/zfs character device is no longer created through the half
implemented Solaris driver DDI interfaces. It is now simply created
with it's own major number as a Linux misc device which greatly simplifies
everything. It is only capable of handling ioctls() but this fits nicely
because that's all it ever has to do. The ZVOL devices unlike in Solaris
do not leverage the same major number as /dev/zfs but instead register
their own major. Because only one major is allocated and space is reserved
for 16 partitions per-device there is a limit of 16384 concurrent ZVOL
devices. By using multiple majors like the scsi driver this limit could
be addressed if it becomes a problem.
* The {spa,zfs,zvol}_busy() functions have all be removed because they
are not required on a Linux system. Under Linux the registered module
exit function will not be called while the are still references to the
module. Once the exit function is called however it must succeed or
block, it may not fail so returning an error on module unload makes to
sense under Linux.
* With the addition of ZVOL support all the HAVE_ZVOL defines were removed
for obvious reasons. However, the HAVE_ZPL defines have been relocated
in to the linux-{kernel,user}-disk topic branches and must remain until
the ZPL is implemented.
2009-11-20 11:06:59 -08:00
6376951ac9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-11-20 10:58:52 -08:00
67154a81b9
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-11-20 10:58:51 -08:00
bc20ccb15c
Revert just zfs_ioctl.c changes moved to linux-kernel-disk branch.
2009-11-20 10:55:19 -08:00
a40a4803a8
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-11-20 10:39:42 -08:00
6936334ac1
Revert linux-have-uio-rw branch, moved to linux-kernel-disk branch.
2009-11-20 10:35:26 -08:00
0fa82994c4
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-20 10:31:30 -08:00
fa92669c86
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-11-20 10:30:58 -08:00
49fdb13bc8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-11-20 10:30:50 -08:00
29dd6c3161
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-11-20 10:30:42 -08:00
7da32c3c8e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-11-20 10:30:41 -08:00
4edabd1904
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-11-20 10:30:30 -08:00
d40808c351
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-11-20 10:30:28 -08:00
07cdadc1f8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-11-20 10:30:27 -08:00
2fb4c69f17
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-20 10:29:58 -08:00
6d8a17ed45
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-11-20 10:29:52 -08:00
cac1bc41dc
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-20 10:29:49 -08:00
77c347db31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-11-20 10:29:48 -08:00
0f315a58bb
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-11-20 10:29:47 -08:00
0160d32326
Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL
2009-11-20 10:16:37 -08:00
3191b962f6
Prevent gcc uninit compiler warning in zfs_range_unlock_reader().
2009-11-20 09:59:58 -08:00
911692fabb
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-11-15 16:28:51 -08:00
5fac7f55be
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-11-15 16:28:16 -08:00
50e6c144e6
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-11-15 16:28:08 -08:00
52f859a6cc
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-11-15 16:27:59 -08:00
af5810b03a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-11-15 16:27:59 -08:00
c03a7d863c
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-11-15 16:27:44 -08:00
b6c57fe77e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-11-15 16:27:44 -08:00
826e82eff2
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-11-15 16:27:12 -08:00
1b5b05c1c3
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-11-15 16:27:05 -08:00
d00a0ea8a0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-11-15 16:27:02 -08:00
71ccaccb2b
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2009-11-15 16:27:00 -08:00
475e214ce1
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-11-15 16:27:00 -08:00
65f6d4b712
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-11-15 16:26:58 -08:00
8c5797df77
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-11-15 16:26:58 -08:00
b57e406dd6
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-11-15 16:26:47 -08:00
e57bf40c98
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-11-15 16:26:36 -08:00
00f3dfb5e9
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
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
Brian Behlendorf
Ricardo M. Correia