002809a885
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:31 -07:00
06da6ccf97
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:42:30 -07:00
818eafca5b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:42:30 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
f1e0deaa81
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-28 10:14:45 -07:00
3450d1f3b5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:14:43 -07:00
af051f1250
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:14:43 -07:00
157df8338c
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-05-28 10:14:42 -07:00
9eec97e163
Revert fix-dsl_pool_t fixed upstream
2010-05-28 10:08:02 -07:00
410adb5765
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-28 10:00:46 -07:00
c2c3358a6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:00:44 -07:00
11510b3513
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:00:44 -07:00
396fb1e235
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-28 10:00:43 -07:00
11a9bfc7f8
Revert fix-taskq changes reevaluate after update.
2010-05-28 09:54:03 -07:00
35c6907c74
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 17:02:17 -07:00
2fbe461b55
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 17:02:15 -07:00
a7dcb2247a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 17:02:14 -07:00
146ded4db2
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-27 17:02:13 -07:00
db069704ed
Revert fix-clock-wrap fixed upstream
...
This was more or less fixed upstream. Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
b265da19f0
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 14:15:08 -07:00
3a7896c8d2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 14:15:08 -07:00
aabc970314
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 14:15:08 -07:00
b754295dec
Revert feature-zap-cursor-to-key feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 14:12:59 -07:00
84633aa1a1
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 13:53:12 -07:00
8605817009
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 13:53:12 -07:00
0ee82dae98
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2010-05-27 13:53:07 -07:00
5cad1e175d
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
module/zfs/dmu_tx.c
module/zfs/txg.c
2010-05-27 13:48:54 -07:00
d8e5eb56b8
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-05-27 13:42:00 -07:00
028e42b692
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 13:42:00 -07:00
1dc4235011
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:40:14 -07:00
1e32b3c781
Revert feature-commit-cb feature upstream
...
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
3bd93e7103
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-05-27 13:25:20 -07:00
099e8e493a
Remove feature-pthreads prior to b141 update.
...
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
2010-05-27 13:23:58 -07:00
af12c8fa08
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:38 -07:00
94655e1c30
Use __blk_end_request() in zvol_request() to avoid ZVOL deadlock.
...
The unlocked version of blk_end_request() should be used in the
zvol_request() error handling to avoid deadlocking the request_queue
queue_lock. Things get a little more complicated for older kernel
APIs but the compat layer has been updated as well to reflect this.
2010-05-21 15:01:12 -07:00
a221019e82
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-20 17:17:42 -07:00
cdd590f8b9
Recreate volume and snapshot /dev links during module load.
...
Links in /dev for volumes/snapshots were only being created
at volume/snapshot creation time. Those links are now also
created dynamically at module load time based on the spa config.
In other words all you need to do to get access to your zfs
datasets after a reboot is load the module. It's magic!
2010-05-20 16:59:02 -07:00
c8d574777d
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 14:51:13 -07:00
fe3cca82ae
Support KM_NODEBUG kmem flag.
...
It turns out the zil allocates quite large buffers. This isn't
all the surprising but we need to suppress the warnings until
it's clear what to do about it.
2010-05-20 14:35:02 -07:00
c7068a5d76
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-20 10:25:20 -07:00
4ae64a8acd
Move from kmem_alloc() to vmem_alloc().
...
These two allocations are 16k in size which trips the SPL warning
about large kmem_allocs(). For now simply shift them to a vmem_alloc().
Yes, this has it's own set of problems but this happens infrequently
enough not to be a real issue. But more importantly it means that
we've flagged this place in the code via this topic branch as a
place which still needs long term work.
2010-05-20 10:06:32 -07:00
630ce17804
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-18 14:23:08 -07:00
86f961b310
Update all zpios related headers for consistency and correctness.
2010-05-18 14:18:09 -07:00
91975bc4f9
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-18 11:40:29 -07:00
a2c57ce830
Update headers to be correct for public release
...
This includes adding the copyright where appropriate, author
attribution, and including the Lawrence Livermore National
Security, LLC release code for new/rewritten files.
2010-05-18 11:31:37 -07:00
a1658d8d17
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-14 13:31:32 -07:00
bb5e111dde
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-14 13:31:29 -07:00
08eb7517c4
Remove 3 symbols which no longer need to be exported.
...
EXPORT_SYMBOL(zfs_ereport_post);
EXPORT_SYMBOL(zfs_post_remove);
EXPORT_SYMBOL(zfs_post_autoreplace);
2010-05-14 13:00:22 -07:00
feb723fa7d
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-14 12:55:10 -07:00
Brian Behlendorf