Commit Graph

1612 Commits

Author SHA1 Message Date
Brian Behlendorf 8bb9b8305a Export new quota related symbols. 2009-07-10 11:38:53 -07:00
Brian Behlendorf 33eec3513e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-10 10:55:07 -07:00
Brian Behlendorf 452ebd84b7 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-10 10:55:04 -07:00
Brian Behlendorf 0d4deb4760 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-10 10:54:18 -07:00
Brian Behlendorf bb9e6cc882 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-10 10:53:05 -07:00
Brian Behlendorf 925fa57107 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-10 10:52:37 -07:00
Brian Behlendorf df59544928 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-10 10:52:36 -07:00
Brian Behlendorf e5d6b866f7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-10 10:52:13 -07:00
Brian Behlendorf ca2e8a0a7f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-10 10:52:11 -07:00
Brian Behlendorf 37e6d3e769 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-10 10:50:18 -07:00
Brian Behlendorf b4a5983ebf Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-10 10:50:15 -07:00
Brian Behlendorf 4baa59ce44 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-10 10:50:13 -07:00
Brian Behlendorf cfec48619c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-10 10:50:12 -07:00
Brian Behlendorf 84b52133f3 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-10 10:50:10 -07:00
Brian Behlendorf f3c55459b0 Pull ; in to macro to ensure it get's entirely removed, C90 issue. 2009-07-10 10:40:55 -07:00
Brian Behlendorf ec3045dcf2 Refine HAVE_ZPL checks after b117 update. 2009-07-10 10:39:44 -07:00
Brian Behlendorf 0c390c6de4 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-09 15:12:29 -07:00
Brian Behlendorf 0539df32a1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-09 15:11:47 -07:00
Brian Behlendorf 9056388e75 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-09 15:10:39 -07:00
Brian Behlendorf bfcab44eb7 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 15:10:14 -07:00
Brian Behlendorf 2ec527b793 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 15:10:12 -07:00
Brian Behlendorf ac47fd1d1f Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 15:09:51 -07:00
Brian Behlendorf f8938a398f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 15:09:50 -07:00
Brian Behlendorf 791241dfb0 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-09 15:08:11 -07:00
Brian Behlendorf 7211f81057 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-09 15:08:07 -07:00
Brian Behlendorf 24662d61d9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 15:08:06 -07:00
Brian Behlendorf 2f4e745a09 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 15:08:04 -07:00
Brian Behlendorf bed14af385 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-07-09 15:08:03 -07:00
Brian Behlendorf ae132945b4 Add suggested paranthesis. 2009-07-09 14:59:10 -07:00
Brian Behlendorf f13edd3084 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-09 14:20:38 -07:00
Brian Behlendorf 8a849a66fe Wrap all the ACL interfaces for now with HAVE_ZPL. They are integrated
with the vfs layer which is not at all supported yet.
2009-07-09 14:11:13 -07:00
Brian Behlendorf 99880c2dc1 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-09 13:22:09 -07:00
Brian Behlendorf a3a9c56aa1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-09 13:21:25 -07:00
Brian Behlendorf 8fba9a5957 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-09 13:20:09 -07:00
Brian Behlendorf f99ad7f4c3 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 13:19:41 -07:00
Brian Behlendorf ebb013f2dd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 13:19:39 -07:00
Brian Behlendorf 176ce8248a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 13:19:17 -07:00
Brian Behlendorf db193d4ca9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 13:19:15 -07:00
Brian Behlendorf 5b606597a8 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-09 13:17:32 -07:00
Brian Behlendorf 617385b6f2 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-09 13:17:28 -07:00
Brian Behlendorf 17d368fa5f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 13:17:27 -07:00
Brian Behlendorf a3bc97c2c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 13:17:26 -07:00
Brian Behlendorf 9ad0fef49e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Conflicts:

	module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
Brian Behlendorf 683b2f0d00 TopGit missed this update when I updated the same line in the
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.
2009-07-09 13:07:05 -07:00
Brian Behlendorf e05c1f7986 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-09 12:28:29 -07:00
Brian Behlendorf af0e394f1e Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-09 12:27:45 -07:00
Brian Behlendorf b759d9db89 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-09 12:26:29 -07:00
Brian Behlendorf 7f3ee7a5ef Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 12:26:00 -07:00
Brian Behlendorf e945770943 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 12:25:58 -07:00
Brian Behlendorf 8551a101ea Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 12:25:34 -07:00
Brian Behlendorf 0c3f631b72 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 12:25:32 -07:00
Brian Behlendorf 999f693b85 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-09 12:23:46 -07:00
Brian Behlendorf 1708d28097 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-09 12:23:43 -07:00
Brian Behlendorf c4c4afd8fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 12:23:41 -07:00
Brian Behlendorf 6db8882b78 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 12:23:39 -07:00
Brian Behlendorf 76bf02aebb Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-09 12:23:36 -07:00
Brian Behlendorf a551134b2f Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:14:56 -07:00
Brian Behlendorf a19906fe65 Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:13:56 -07:00
Brian Behlendorf f1d99c0653 Revert to original debugging code and wrap any variabled used only
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.
2009-07-09 12:10:52 -07:00
Brian Behlendorf 2ed7001286 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-09 10:44:11 -07:00
Brian Behlendorf 38d7e6d061 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-09 10:43:29 -07:00
Brian Behlendorf 2d4fa0b507 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-09 10:42:25 -07:00
Brian Behlendorf e91a439720 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-09 10:42:21 -07:00
Brian Behlendorf 2018d0e610 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-09 10:41:54 -07:00
Brian Behlendorf 7a724b1db0 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-09 10:41:53 -07:00
Brian Behlendorf 19e8f65be3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-09 10:41:31 -07:00
Brian Behlendorf 64e827d295 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-09 10:41:30 -07:00
Brian Behlendorf 149eea21db Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-09 10:39:49 -07:00
Brian Behlendorf a8d32ac1e2 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-09 10:39:46 -07:00
Brian Behlendorf e5e94c40f7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-09 10:39:44 -07:00
Brian Behlendorf aa8ed32ee8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-09 10:39:43 -07:00
Brian Behlendorf 9e394e10a9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-09 10:39:41 -07:00
Brian Behlendorf 2cc278c96f This change looks to have been made due to Sun bug 6803822, but
it's not exactly clear to me why.  Regardless I'm taking it.
2009-07-09 10:30:06 -07:00
Brian Behlendorf 43af29de5f Type int accidentally not declared at the top of the function. 2009-07-09 10:19:02 -07:00
Brian Behlendorf 4d410127b0 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-09 08:49:29 -07:00
Brian Behlendorf cc6e67fa7f Wrap sysevent includes until sysevent or something like it is implemented. 2009-07-09 08:40:33 -07:00
Brian Behlendorf b12e8eb702 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-08 09:20:37 -07:00
Brian Behlendorf cfa46b4440 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-08 09:19:57 -07:00
Brian Behlendorf 6e1c4e5bd6 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-08 09:18:45 -07:00
Brian Behlendorf 0d73002d8d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-08 09:18:20 -07:00
Brian Behlendorf 1e0e588128 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-08 09:18:18 -07:00
Brian Behlendorf 2aa22c1ccb Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-08 09:17:53 -07:00
Brian Behlendorf 1355255010 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-08 09:17:52 -07:00
Brian Behlendorf affa4ec536 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-08 09:16:10 -07:00
Brian Behlendorf aa636ae442 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-08 09:16:07 -07:00
Brian Behlendorf 33077ad631 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 09:16:05 -07:00
Brian Behlendorf f00e6fe5c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-08 09:16:04 -07:00
Brian Behlendorf 5fc46112cb Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-08 09:16:01 -07:00
Brian Behlendorf 58f5e63293 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:05:37 -07:00
Brian Behlendorf 28718acdab Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-07 17:13:35 -07:00
Brian Behlendorf 756d013735 Disable autoexpand notifing sysevent which is not supported. 2009-07-07 17:06:27 -07:00
Brian Behlendorf 85f46e8651 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-07 16:35:05 -07:00
Brian Behlendorf dd1e80c3c5 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-07 16:34:26 -07:00
Brian Behlendorf b9813a2a75 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-07 16:33:24 -07:00
Brian Behlendorf 6bc6e35298 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-07 16:32:58 -07:00
Brian Behlendorf 8028fd5db5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-07 16:32:57 -07:00
Brian Behlendorf 68a0ba0bc3 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-07 16:32:35 -07:00
Brian Behlendorf deacdbc785 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-07 16:32:34 -07:00
Brian Behlendorf 67e2052f52 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-07-07 16:31:01 -07:00
Brian Behlendorf b6cf87b32d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-07 16:30:58 -07:00