Commit Graph

148 Commits

Author SHA1 Message Date
Brian Behlendorf 658459249e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 13:17:28 -07:00
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf 10e245f03f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
Conflicts:
	cmd/zpool/zpool_main.c
2009-03-16 10:42:20 -07:00
Brian Behlendorf e98228ab73 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-16 10:39:08 -07:00
Brian Behlendorf dbbb5c2e4e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-16 10:38:52 -07:00
Brian Behlendorf c9cff73d9e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
	cmd/zpool/zpool_main.c
2009-03-16 10:32:12 -07:00
Brian Behlendorf be112b3f57 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-16 10:30:31 -07:00
Brian Behlendorf 5ee8a85ba6 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-03-16 10:30:27 -07:00
Brian Behlendorf 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
Brian Behlendorf fbbb5fe669 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-12 10:40:09 -07:00
Brian Behlendorf 45f3d2a2a4 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-12 10:38:05 -07:00
Brian Behlendorf 5f9ae91a8a Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-12 10:37:50 -07:00
Brian Behlendorf 9bdbd7c8f7 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-12 10:37:18 -07:00
Brian Behlendorf b9b399bf04 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-12 10:37:14 -07:00
Brian Behlendorf f8fe8a76f4 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-12 10:37:11 -07:00
Brian Behlendorf 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
Brian Behlendorf da4d2eea9d Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-11 23:10:06 -07:00
Brian Behlendorf 73db9f622c Pull unused err variable under HAVE_DM_INUSE_SWAP ifdef. 2009-03-11 23:05:42 -07:00
Brian Behlendorf 0d19b2613b Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-03-11 22:50:31 -07:00
Brian Behlendorf 1c0279a08f Resolve newly revealed unused vars and symbols caused by topic branch. 2009-03-11 22:43:09 -07:00
Brian Behlendorf b2041bc8ef Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-03-11 14:13:33 -07:00
Brian Behlendorf 330dbde81a Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 14:12:39 -07:00
Brian Behlendorf cac68bc478 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 14:09:49 -07:00
Brian Behlendorf 0f0abc8d58 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 14:09:36 -07:00
Brian Behlendorf 5afc3db3ce Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-11 14:08:57 -07:00
Brian Behlendorf 1ca6578ebc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 14:08:51 -07:00
Brian Behlendorf e5011401cd Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-03-11 14:08:48 -07:00
Brian Behlendorf 3226eea157 Resolve additional cases where gcc wants extra parenthesis.
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
Brian Behlendorf af12291488 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/zfs_replay.c
2009-03-11 11:22:11 -07:00
Brian Behlendorf 261ca2beb9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-11 11:19:58 -07:00
Brian Behlendorf 47e0037a8b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-11 11:15:59 -07:00
Brian Behlendorf bc22a004ee Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-11 11:15:40 -07:00
Brian Behlendorf bf200630f9 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
	module/zfs/rrwlock.c
	module/zfs/spa_boot.c
	module/zfs/zfs_replay.c
2009-03-11 11:12:24 -07:00
Brian Behlendorf dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf 7b8eca908f Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:38:20 -08:00
Brian Behlendorf 437bc77985 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-02-18 14:36:49 -08:00
Brian Behlendorf f78c15d84f Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-02-18 14:34:03 -08:00
Brian Behlendorf 7e21796d7e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-02-18 14:33:48 -08:00
Brian Behlendorf 8090a9a908 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/zpool/zpool_main.c
2009-02-18 14:31:46 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf adcb983918 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-15 14:22:14 -08:00
Brian Behlendorf df7ad715a9 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-15 14:21:49 -08:00
Brian Behlendorf cb8e50168e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-15 14:19:06 -08:00
Brian Behlendorf fd0e369487 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-15 14:19:00 -08:00
Brian Behlendorf 1f372d9030 Resolve conflict with removed cleaner type 2009-01-15 14:18:01 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 35cfc1bb85 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-05 12:45:38 -08:00
Brian Behlendorf 681ba5c296 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-05 12:41:42 -08:00
Brian Behlendorf c8fa7c9b23 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-05 12:39:56 -08:00
Brian Behlendorf ce248fc03d Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-05 12:39:45 -08:00
Brian Behlendorf 9a0cb95b1b Resolve conflict 2009-01-05 12:38:23 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf 1e9c6b3020 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:24:47 -08:00
Brian Behlendorf 79491b69f4 Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00
Brian Behlendorf 8b0a74c863 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 10:11:31 -08:00
Brian Behlendorf c72d6b30e8 Remove one more header 2008-12-22 10:07:53 -08:00
Brian Behlendorf 233dda723f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 09:26:58 -08:00
Brian Behlendorf d52676f52b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:26:35 -08:00
Brian Behlendorf c60d76734b Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 09:25:57 -08:00
Brian Behlendorf b608990fea Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:25:52 -08:00
Brian Behlendorf ecf38d314e Resolve conflict 2008-12-22 09:25:04 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf d1ff9a15ca Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 09:13:13 -08:00
Brian Behlendorf 894c412b86 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:12:50 -08:00
Brian Behlendorf 4aeafba548 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 09:12:11 -08:00
Brian Behlendorf 7b9d830da2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:12:06 -08:00
Brian Behlendorf e959b03a8e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 09:11:54 -08:00
Brian Behlendorf 98810ac9fb Update zpool Makefile 2008-12-22 09:10:00 -08:00
Brian Behlendorf bf01b1ccdf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-16 09:06:12 -08:00
Brian Behlendorf 151ee60cbf Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-16 09:05:02 -08:00
Brian Behlendorf 589a6c72d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-16 09:03:27 -08:00
Brian Behlendorf 4504aa575b Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-16 09:03:17 -08:00
Brian Behlendorf 3ba34afff8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-16 09:02:49 -08:00
Brian Behlendorf a7b063d224 Add DEFAULT_INCLUDE to rules, adjust = to += accordingly 2008-12-16 08:58:41 -08:00
Brian Behlendorf 06c36a4115 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-12 08:53:24 -08:00
Brian Behlendorf 370d47306c Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-12 08:53:03 -08:00
Brian Behlendorf 579ce8f9b7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-12 08:52:28 -08:00
Brian Behlendorf 690e4461e6 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-12 08:52:24 -08:00
Brian Behlendorf 9e66117d33 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-12 08:52:13 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf 645c51287f Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-11 11:37:35 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf 1b0348e335 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 11:35:29 -08:00
Brian Behlendorf a9ec92e894 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-11 11:35:19 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00