4576ca6889
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-04 14:39:53 -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
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
9dec42d15d
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-31 14:06:28 -07:00
0c20001d27
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-31 14:06:05 -07:00
21dee98331
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-31 14:05:42 -07:00
e03d56f19c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-31 14:04:46 -07:00
744f29654f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-31 14:03:32 -07:00
4880532956
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-31 14:02:54 -07:00
9f5e45ef4d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-31 14:02:49 -07:00
cf44f97b96
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-31 14:02:48 -07:00
252846a145
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-07-31 14:02:46 -07:00
cfd9e9936f
Fix an accidentally introduced formatting issue in zfs output.
...
Because the local 'index' variable shadows the index() function
it was replaced by 'i'. Unfortunately when I made this change
I accidentally replaced one instance with 'j' resulting in the
short decimal values being printed incorrectly.
2009-07-31 13:50:21 -07:00
dbee607bbd
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-29 21:31:26 -07:00
d6bde0ec4f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-29 21:31:02 -07:00
54f3881f7a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-29 21:30:36 -07:00
9cdb618921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-29 21:29:28 -07:00
d29bbc0642
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-29 21:28:05 -07:00
640e02d051
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-29 21:27:17 -07:00
2d86fb2788
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-29 21:27:13 -07:00
e2bbeb5e61
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-29 21:27:06 -07:00
f80c505f4d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-29 21:27:04 -07:00
72d2035ed3
Updated gcc in fc11 flagged a new uninitialized variable.
2009-07-29 21:17:47 -07:00
484b3af49f
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-24 11:17:33 -07:00
f86aa17c6c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-24 11:17:09 -07:00
278a36455f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-24 11:15:55 -07:00
a9ffd4b53b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-24 11:14:53 -07:00
937dfea552
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-24 11:13:42 -07:00
430d6004e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
scripts/Makefile.am
2009-07-24 11:10:21 -07:00
db3967ba86
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-24 11:08:43 -07:00
9a2275c1c5
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-24 11:08:42 -07:00
51760e3c7e
Change VERIFY() into VERIFY3U() when creating threads in ztest, so that we can see the return code when it fails.
...
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-24 11:00:23 -07:00
cbb3788214
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-24 09:19:34 -07:00
a65ba1acc5
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-24 09:19:12 -07:00
8f1db6316f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-24 09:18:50 -07:00
9b7658ca98
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-24 09:17:54 -07:00
fe9f4bdd27
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-24 09:16:41 -07:00
4edfcf44ec
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-24 09:15:59 -07:00
82ca18caae
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-24 09:15:56 -07:00
825c086a4e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-24 09:15:55 -07:00
e4610d7991
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-24 09:15:53 -07:00
1b4dfb80fb
Increase buffer size for nvlist for large configurations
...
It's still not clear to me why the default value here is large
enough Solaris. I hit this limit again when setting up 120 SATA
drives configured as 15 raidz2 groups each containing 8 drives.
We expect to go bigger so we may just want to spend a little
time and figure out how to make this all dynamic.
2009-07-24 08:53:18 -07:00
b3dab369eb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-20 13:26:05 -07:00
2b1eaf77d4
Remove zfs_debug.h which is a duplicate of the version in the
...
modules directory. Having two copies is just asking for trouble.
2009-07-20 13:18:24 -07:00
65e81abfed
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-17 09:46:23 -07:00
3a63d17619
Add option -fPIC (Position Independent Code) needed for x86_64.
...
While the generic atomic implementation is not used by default
for x86_64 or x86 builds, we still need to always build it with
-fPIC if we ever want to use it on these platforms.
2009-07-17 09:36:01 -07:00
35e7382fd2
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-16 13:46:15 -07:00
18b7a966e4
Minor build fixes from asm-generic change.
...
- Drop _NOTE(CONSTCOND) usage in libspl this is Solaris specific.
- Resolve conflicting OR and AND long prototypes.
2009-07-16 13:37:59 -07:00
ac81bc8094
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-16 10:28:14 -07:00
3ae0e369f3
Add generic user space atomic support.
...
Futher testing on my powerpc system revealed that the powerpc
specific atomic implemetation was flawed. Rather than spending
a lot of time correctly reimplementing it in assembly I have
reworked it in to a 100% generic version. The generic version
will not perform well but it does provide correct sematics. It
will be used only when there is no architecture specific version
available. These changes do not impact x86_64 and x86 which have
have correct native implementations.
2009-07-16 09:59:44 -07:00
f7ea79b354
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-14 16:56:00 -07:00
1c396c4600
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-14 16:55:21 -07:00
46ffc6bfd1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-14 16:54:39 -07:00
c22614ed12
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-14 16:52:59 -07:00
56045106bd
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-14 16:50:54 -07:00
5b0851cbdb
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-14 16:49:36 -07:00
5753d78dcd
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-14 16:49:29 -07:00
e9d7526fb3
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-14 16:49:27 -07:00
a13cdecdd2
Remove debug printf
2009-07-14 16:35:13 -07:00
5a3e63ff19
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-14 15:38:46 -07:00
4279777f47
Fixed the zpool and zfs commands returning 'internal error: Out of memory.' due to a failure in nvlist_common().
...
The failure turned out to be missing macro definitions for little
endian and big endian.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-14 15:31:03 -07:00
3b65f6fab8
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-14 14:39:38 -07:00
5427e1eec2
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-14 14:39:09 -07:00
2807f723c1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-14 14:38:39 -07:00
477c7a7281
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-14 14:37:21 -07:00
563dcb7a96
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-14 14:35:41 -07:00
8121895a61
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-14 14:34:44 -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
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
7e720d98a3
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-09 12:28:04 -07:00
9cf1451c53
Add ASSERTV macro to simplify removing variables (the V in ASSERTV)
...
when they are only used in ASSERTs which will be compiled out.
2009-07-09 12:08:40 -07:00
7669102a92
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-08 16:26:27 -07:00
a3d336e1ae
Drop support for the Solaris user space thread_t API. This was just
...
too confusing. The two consumers of this (ztest.c and taskq.c) have
been updated to use the Solaris kernel space kthread_t API which is
provided by zfs_context.h.
2009-07-08 16:15:42 -07:00
20635eaf51
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-08 15:05:19 -07:00
fd94a958ff
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-08 15:04:51 -07:00
133f5a2bdd
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-08 15:04:23 -07:00
47701d2c24
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-08 15:03:11 -07:00
28dcf07ed5
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-08 15:01:40 -07:00
c821af8f89
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-08 15:00:48 -07:00
058a25a017
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-08 15:00:43 -07:00
275d66171b
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-08 15:00:41 -07:00
1ab1b8502b
Stop the kthread/thread/pthread mixing and matching insanity. Update all
...
code to only use the kthread API regardless of if it is compiled in the
kernel or user space. The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
15c4a8be0c
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-07 15:35:07 -07:00
31157f3a90
Disable zpool_relabel_disk() which requires libefi until we have it.
2009-07-07 15:26:39 -07:00
23e01e6cde
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-07 15:07:37 -07:00
24402e5c15
Drop duplicate defines
2009-07-07 14:58:56 -07:00
c35e61eea2
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-07 14:50:41 -07:00
04aa3d5ef9
Header aclutils.h only needed by idmap.
2009-07-07 14:41:19 -07:00
678b02cd8e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-07 14:32:59 -07:00
78d7c67598
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 14:32:34 -07:00
c3efeee12a
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-07 14:32:08 -07:00
daebbab116
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-07 14:31:41 -07:00
acd26f0d75
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-07 14:30:34 -07:00
33804ec976
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-07 14:29:09 -07:00
7c76f3ce22
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 14:28:18 -07:00
3ad5361df2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 14:28:14 -07:00
ba97ae2628
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-07 14:28:13 -07:00
ed3bd6f446
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-07-07 14:19:35 -07:00
798cf63309
New topic branch for minor acl related fixes
2009-07-07 14:18:47 -07:00
81729c2c73
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-07 14:14:24 -07:00
dd3f9c1ed4
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 14:13:57 -07:00
acf9b98673
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-07 14:13:30 -07:00
e945eb4fe1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-07 14:13:02 -07:00
8e7e41cfb0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-07 14:11:46 -07:00
02bc7929d4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-07 14:08:22 -07:00
1ff9c70da3
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-07 14:04:47 -07:00
34422f0ffa
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 13:50:32 -07:00
47502cd94b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 13:50:31 -07:00
fb26df15c8
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-07-07 13:50:30 -07:00
cad9fa40e1
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-07 13:50:29 -07:00
a2423197e1
Resolve missing cast warning
2009-07-07 13:41:51 -07:00
361e0e7685
Fix newly introduced missing braces warnings for gcc.
2009-07-07 13:40:16 -07:00
ee92267c38
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-07 13:20:40 -07:00
9661d38088
Add topic branch to conditionally remove idmap support. The
...
only things currently like this on linux appears in the nfs v4
implementation of idmap. For now we can do with out.
2009-07-07 13:16:24 -07:00
70804727b1
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-07-07 10:15:04 -07:00
5ae3e75ace
Wrap new sysevent includes in HAVE_SYSEVENT ifdef
2009-07-07 10:07:23 -07:00
a6b1465e30
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/include/sys/zfs_fuid.h
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 15:16:54 -07:00
ab16fdc9ad
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-06 15:09:10 -07:00
409cfe5051
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
...
Conflicts:
lib/libzfs/libzfs_pool.c
2009-07-06 15:05:47 -07:00
b56250900b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-06 15:02:55 -07:00
266a7d8cd7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zcommon/zfs_namecheck.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
2009-07-06 13:47:04 -07:00
053043b2d0
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
...
Conflicts:
lib/libzfs/libzfs_pool.c
2009-07-06 13:44:19 -07:00
149c4b2731
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_pool.c
module/zcommon/zfs_namecheck.c
module/zfs/dmu.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 13:40:29 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
cd098f87c8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:16:29 -07:00
e320858042
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-07-06 13:12:54 -07:00
01c3cfc58f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
module/zfs/zil.c
2009-07-06 13:12:23 -07:00
a1ccb00b7e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
module/zfs/zil.c
2009-07-06 13:11:34 -07:00
480b03791d
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-02 17:07:52 -07:00
a06a428e15
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zinject/zinject.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/dmu_object.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
2009-07-02 17:06:20 -07:00
244d656e28
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-07-02 16:59:39 -07:00
44703f0029
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/arc.c
module/zfs/spa.c
2009-07-02 16:57:09 -07:00
b095bf444a
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
...
Conflicts:
cmd/zfs/zfs_main.c
lib/libzfs/libzfs_dataset.c
2009-07-02 16:50:53 -07:00
e2b2597751
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zinject/zinject.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_graph.c
module/zcommon/include/sys/fm/fs/zfs.h
module/zcommon/include/zfs_deleg.h
module/zcommon/include/zfs_namecheck.h
module/zcommon/zfs_deleg.c
module/zcommon/zfs_namecheck.c
module/zcommon/zprop_common.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_object.c
module/zfs/dmu_objset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/fletcher.c
module/zfs/include/sys/dsl_deleg.h
module/zfs/include/sys/dsl_prop.h
module/zfs/include/sys/metaslab_impl.h
module/zfs/include/sys/spa_boot.h
module/zfs/include/sys/zap.h
module/zfs/include/sys/zap_impl.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ctldir.h
module/zfs/include/sys/zfs_dir.h
module/zfs/include/sys/zfs_fuid.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/spa.c
module/zfs/spa_errlog.c
module/zfs/spa_history.c
module/zfs/zap.c
module/zfs/zap_leaf.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c
2009-07-02 16:49:11 -07:00
e9f14862a5
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/vdev_label.c
module/zfs/zio.c
2009-07-02 16:18:03 -07:00
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
f2d80ee1f5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-01 12:57:32 -07:00
255ef81e33
Fix 'make dist' on powerpc64 by include an atomic.S place holder file.
...
Add EXTRA_DIST atomic.c for powerpc64 to ensure source is packaged.
2009-07-01 12:49:10 -07:00
5974d1d85e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-07-01 11:36:21 -07:00
63845164a6
Use $(RM) macro to ensure -f is passed.
...
Preserve path for installed headers with nobase.
2009-07-01 11:31:47 -07:00
df388bfc0a
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-01 11:11:48 -07:00
685b7d85d3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-07-01 11:11:34 -07:00
d959a6177a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-01 11:11:20 -07:00
212ecc6560
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-01 11:10:44 -07:00
8c684c8d85
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-01 11:10:24 -07:00
95ab1a0980
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-01 11:09:59 -07:00
b44445a8f1
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-01 11:09:33 -07:00
Brian Behlendorf
Ricardo M. Correia