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
8390fe4b4b
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 12:20:30 -07:00
fcfae8fbee
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-28 12:20:30 -07:00
c37d6443a4
Revert fix-get-configs should no longer be needed
2010-05-28 12:18:45 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
e134b976b6
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-08-18 14:18:33 -07:00
b29c1f87a0
Required build 121 updates for gcc-missing-braces
2009-08-18 14:08:46 -07:00
b3ea816a68
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-08-18 12:09:36 -07:00
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
41b297a27f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-08-18 12:08:46 -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
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
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -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
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
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
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
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
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
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
9babb37438
Rebase master to b117
2009-07-02 15:44:48 -07:00
f86b52a39d
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-16 16:17:55 -07:00
3eebe1bd0e
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-03-16 16:17:54 -07:00
3eb4ba3ebd
Add 3 more uninit errors detected by gcc 3.4.0 compiler.
2009-03-16 16:06:50 -07:00
5ee8a85ba6
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-16 10:30:27 -07:00
9818e69640
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-03-16 10:12:01 -07:00
2924858552
Remove two self referential functions.
...
Newer versions of gcc (4.3.0) detected the following unused
code segments.
2009-03-16 10:02:06 -07:00
6a59551cb7
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-03-12 15:26:13 -07:00
c4e10eb3df
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-03-12 15:21:30 -07:00
Brian Behlendorf