c58b9ed603
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-07-06 15:21:26 -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
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
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
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
e3d5b2a900
Refresh autogen products
2009-07-01 11:37:26 -07:00
80cfd98d8e
Refresh autogen products
2009-06-09 16:46:26 -07:00
26f70525ee
Refresh autogen products
2009-06-08 16:33:33 -07:00
51b59652a3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 21:13:28 -07:00
275f4aae5d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dmu_tx.c
2009-03-19 21:08:17 -07:00
7f33364d3c
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
module/zfs/dmu_tx.c
module/zfs/txg.c
2009-03-19 21:03:58 -07:00
e7f02d3b41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 20:59:33 -07:00
eb811f7fa9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
2009-03-19 20:59:12 -07:00
54b5b41a58
Add 'feature-pthreads' branch to features branch.
2009-03-19 20:49:52 -07:00
61cd467f6d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-19 19:58:45 -07:00
dabea57f25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-03-19 19:55:49 -07:00
5e5d31f105
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzpool/include/sys/zfs_context.h
2009-03-19 19:52:21 -07:00
8c43ad3853
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-19 19:49:56 -07:00
8cdcf1ef44
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-19 19:49:55 -07:00
53db4c7b29
Revert fix-pthreads moving to feature-pthreads branch
2009-03-19 19:43:09 -07:00
a1c694bf03
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-18 13:03:43 -07:00
cc4fbf2c35
Revert to previous behavior zdb fails when unable to open /dev/zfs.
...
For the moment I have added an error message to the failure path to
make it clear what happened. I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure. For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
7fa1ced508
Refresh autogen products, remove stray zdump Makefile.in
2009-03-12 16:48:12 -07:00
0fe418c548
Refresh autogen products
2009-03-12 15:55:23 -07:00
6a1223268c
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 15:47:43 -07:00
82ce8b00f3
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 15:44:14 -07:00
6a5acaa105
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 15:44:13 -07:00
9fe5b916e2
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-03-12 15:39:27 -07:00
9e49df6b20
Add gcc-fortify-source branch
2009-03-12 15:38:51 -07:00
808e542240
Refresh autogen products
2009-03-12 11:06:21 -07:00
635e9ba8a0
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-12 10:41:10 -07:00
b9b399bf04
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-12 10:37:14 -07:00
a03187bb3b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-12 10:37:12 -07:00
f8fe8a76f4
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-12 10:37:11 -07:00
cabd4a69c4
Resolve remaining uninitialized variables
...
Most of these fixes appear to be harmless and should never occur.
However, there were a few cases in this patch which do concern me,
I doubt we're seeing them but they look possible... mainly in the
user tools.
2009-03-12 10:30:41 -07:00
0b5ddcfdca
Refresh autogen products
2009-03-11 22:31:29 -07:00
378663e310
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 21:03:25 -07:00
4c042de40b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 20:59:43 -07:00
60ac8152fe
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 20:59:42 -07:00
9915249546
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-03-11 20:53:11 -07:00
d4dbc7dca8
Resolve all instances of missing braces.
2009-03-11 20:52:21 -07:00
8cb718a76c
Refresh autogen products
2009-03-11 14:25:09 -07:00
b8dd7de0b5
Refresh autogen products
2009-03-11 13:30:38 -07:00
8927c974cf
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-03-11 11:22:46 -07:00
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
e1b736ecc8
Refresh autogen products
2009-03-10 11:42:01 -07:00
db5acee33d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 15:42:36 -08:00
0197f3a298
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 15:40:39 -08:00
975c613269
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-15 15:40:39 -08:00
51730cdeae
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-01-15 15:40:37 -08:00
37a3478d58
Resolve C90 int declared in for() construct
2009-01-15 15:38:26 -08:00
f863f8f848
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-15 14:22:27 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
a42707fcc0
Resolve conflict with removed cleaner type
2009-01-15 14:16:03 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
d3df6b2012
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-01-15 14:01:51 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
9855548496
Refresh autogen products
2009-01-09 11:35:52 -08:00
1f02aaba1c
Refresh autogen products
2009-01-05 12:47:00 -08:00
aaefbb4e76
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-01-05 12:45:45 -08:00
ce7115b807
Add unicode makefile references and support
2009-01-05 12:33:09 -08:00
9403f4a605
Refresh autogen products
2008-12-23 12:39:25 -08:00
d8c0d57440
Refresh autogen products
2008-12-23 10:41:37 -08:00
8cc9fdcd1c
Refresh autogen products
2008-12-22 11:31:34 -08:00
8a667a0028
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 11:31:02 -08:00
356e666729
Add linker flags
2008-12-22 11:26:16 -08:00
9fb38f075b
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 11:25:39 -08:00
24a90ad2c3
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-22 11:25:38 -08:00
34d556babb
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 11:25:37 -08:00
7c89e6b7d5
Fix prototype
2008-12-22 11:25:28 -08:00
75abffec39
Refresh autogen products
2008-12-22 11:10:13 -08:00
cd5f4d7e5d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 11:09:22 -08:00
feb8953178
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 11:07:39 -08:00
b8245db563
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2008-12-22 11:07:38 -08:00
03c0e92dfa
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 11:07:35 -08:00
feb8aecd47
Fix prototype
2008-12-22 11:05:41 -08:00
fdd6fa0727
We don't need to #undef verify here, this is handled better now with the verify cleanup
2008-12-22 11:02:23 -08:00
4bf318d0a8
Add needed libs
2008-12-22 11:00:47 -08:00
b68bbdcf32
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 10:24:54 -08:00
a9e37c248d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-22 10:23:16 -08:00
817ecade1a
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2008-12-22 10:23:14 -08:00
6da71c1404
Fix twop more missing voids in prototypes
2008-12-22 10:20:57 -08:00
8cee053327
Refresh autogen products
2008-12-22 09:28:14 -08:00
e7d9beb361
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-22 09:27:41 -08:00
b58e34e0d8
Update makefiles
2008-12-22 09:22:39 -08:00
3d2e368e7a
Refresh autogen products
2008-12-19 16:12:00 -08:00
c312cacdc2
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-19 11:07:27 -08:00
d67cf69e08
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-19 11:05:49 -08:00
9041f66bad
Fix all instances of for (int i;;) {} that were easily found
2008-12-19 11:03:54 -08:00
3da25300e3
Refresh autogen products
2008-12-18 14:02:22 -08:00
93e36205ba
Refresh autogen products
2008-12-16 17:01:31 -08:00
a82f09c95b
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2008-12-16 17:00:28 -08:00
Brian Behlendorf
Ricardo M. Correia