summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-091-6/+6
|\
| * Add suggested paranthesis.Brian Behlendorf2009-07-091-6/+6
| |
* | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-091-1/+1
|\ \ | | | | | | | | | | | | | | | Conflicts: module/nvpair/nvpair.c
| * | TopGit missed this update when I updated the same line in theBrian Behlendorf2009-07-091-1/+1
| | | | | | | | | | | | | | | | | | gcc-unused and gcc-uninit topic branches at the same time and then ran 'tg update'. I'll need to keep that sort of thing in mind when updating multiple topic branches between updates.
* | | Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-0915-47/+54
|\ \ \
| * | | Unitialized variables should be handled in the gcc-uninit topic branch.Brian Behlendorf2009-07-091-1/+1
| | | |
| * | | Revert to original debugging code and wrap any variabled used onlyBrian Behlendorf2009-07-0914-46/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | within an ASSERT with the ASSERTV macro which will ensure it will be removed when the ASSERTs are commented out. This makes gcc much happier, makes the variables usage explicit, and removes the need for the compiler to detect it is unused and do the right thing.
* | | | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-090-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Unitialized variables should be handled in the gcc-uninit topic branch.Brian Behlendorf2009-07-091-1/+1
| | | |
* | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-091-1/+1
|\ \ \ \
| * | | | Type int accidentally not declared at the top of the function.Brian Behlendorf2009-07-091-1/+1
| | | | |
* | | | | Merge branch 'gcc-cast' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-082-11/+21
|\ \ \ \ \
| * | | | | Add explicit casts for (u_longlong_t) when printing uint64_t.Brian Behlendorf2009-07-081-10/+20
| | | | | |
| * | | | | Add explicit casts for (u_longlong_t) when printing uint64_t.Brian Behlendorf2009-07-081-1/+1
| | | | | |
* | | | | | Merge branch 'gcc-c90' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-082-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Resolve a 2 new cases of for loop variable declared in for()Brian Behlendorf2009-07-081-0/+1
| | | | | |
| * | | | | Resolve a 2 new cases of for loop variable declared in for()Brian Behlendorf2009-07-081-1/+3
| | | | | |
* | | | | | Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-0/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | First fit allocator unused comment it out.Brian Behlendorf2009-07-071-0/+2
| | | | | |
* | | | | | Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-0/+2
|\ \ \ \ \ \
| * | | | | | Add missing case introduced by rebase.Brian Behlendorf2009-07-071-0/+2
| | | | | | |
* | | | | | | Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-072-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add missing paranthesis for gcc.Brian Behlendorf2009-07-072-2/+2
| | | | | | |
* | | | | | | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | hash_lock should always be initializedBrian Behlendorf2009-07-071-1/+1
| | | | | | |
* | | | | | | Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix newly introduced missing braces warnings for gcc.Brian Behlendorf2009-07-071-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'gcc-cast' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-071-1/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Resolve missing cast warningBrian Behlendorf2009-07-071-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-sourceBrian Behlendorf2009-07-02103-4089/+7625
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmd/ztest/ztest.c
* | \ \ \ \ \ \ \ \ Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-bracesBrian Behlendorf2009-07-02103-4089/+7625
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/libzfs/libzfs_dataset.c
* | | | | | | | | | Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-021-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: module/zfs/fletcher.c
| * \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmasBrian Behlendorf2009-07-02103-4089/+7625
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constantsBrian Behlendorf2009-07-02103-4089/+7625
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'gcc-shadow' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadowBrian Behlendorf2009-07-02103-4089/+7625
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: module/zfs/dmu.c
* | | | | | | | | | | | | Merge branch 'gcc-unused' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge commit 'refs/top-bases/gcc-unused' into gcc-unusedBrian Behlendorf2009-07-02103-4088/+7625
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: module/zfs/arc.c module/zfs/zio.c
* | | | | | | | | | | | | Merge branch 'gcc-uninit' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninitBrian Behlendorf2009-07-02103-4088/+7624
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/libzfs/libzfs_dataset.c module/zfs/arc.c module/zfs/spa.c
* | | | | | | | | | | | | Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesisBrian Behlendorf2009-07-02103-4091/+7626
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/libzfs/libzfs_dataset.c module/zfs/arc.c module/zfs/dmu_objset.c module/zfs/dsl_pool.c module/zfs/spa.c module/zfs/zfs_ioctl.c
* | | | | | | | | | | | | Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-caseBrian Behlendorf2009-07-02103-4097/+7625
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/libzfs/libzfs_dataset.c module/zfs/spa.c
* | | | | | | | | | | | | Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototypeBrian Behlendorf2009-07-02103-4089/+7625
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branchBrian Behlendorf2009-07-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \