SOURCES: kernel-desktop-reiser4.patch - reworked: some files from ...
sparky
sparky at pld-linux.org
Sun Nov 19 04:06:29 CET 2006
Author: sparky Date: Sun Nov 19 03:06:29 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- reworked: some files from -mm put together
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18/2.6.18-mm3/
---- Files affected:
SOURCES:
kernel-desktop-reiser4.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/kernel-desktop-reiser4.patch
diff -u SOURCES/kernel-desktop-reiser4.patch:1.4 SOURCES/kernel-desktop-reiser4.patch:1.5
--- SOURCES/kernel-desktop-reiser4.patch:1.4 Mon Nov 6 22:24:21 2006
+++ SOURCES/kernel-desktop-reiser4.patch Sun Nov 19 04:06:24 2006
@@ -1,22 +1,6 @@
-
-reiser4 for 2.6.17, version 3
-it is made off 2.6.17-mm6 + recent bug fixes:
-- missing txn_restart in readdir_common
-- limit number of bytes to read to size of prefaulted area
-- do not allow releasepage to detach page from jnode which is being handled by
- find_or_create_extent
-- removal of special files fix
-- readdir has to txn_restart, therefore, grab space for stat data update has to be forced
-- missing long term lock unlocks in read's error handling code path
-- check page's ref count in reiser4_releasepage
-- file read fix: do not leak hint and context in page fault failure
-
-
-
-diff -puN Documentation/Changes~reiser4-for-2.6.17-3 Documentation/Changes
---- linux-2.6.17/Documentation/Changes~reiser4-for-2.6.17-3 2006-07-28 22:21:06.000000000 +0400
-+++ linux-2.6.17-vs/Documentation/Changes 2006-07-28 22:21:06.000000000 +0400
-@@ -36,6 +36,7 @@ o module-init-tools 0.9.10
+--- linux-2.6.18.orig/Documentation/Changes 2006-09-20 03:42:06.000000000 +0000
++++ linux-2.6.18.reiser4/Documentation/Changes 2006-11-19 02:58:40.276150237 +0000
+@@ -36,6 +36,7 @@
o e2fsprogs 1.29 # tune2fs
o jfsutils 1.1.3 # fsck.jfs -V
o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs
@@ -24,7 +8,7 @@
o xfsprogs 2.6.0 # xfs_db -V
o pcmciautils 004
o pcmcia-cs 3.1.21 # cardmgr -V
-@@ -145,6 +146,13 @@ The reiserfsprogs package should be used
+@@ -145,6 +146,13 @@
versions of mkreiserfs, resize_reiserfs, debugreiserfs and
reiserfsck. These utils work on both i386 and alpha platforms.
@@ -38,7 +22,7 @@
Xfsprogs
--------
-@@ -326,6 +334,10 @@ Reiserfsprogs
+@@ -323,6 +331,10 @@
-------------
o <http://www.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.3.tar.gz>
@@ -49,9 +33,8 @@
Xfsprogs
--------
o <ftp://oss.sgi.com/projects/xfs/download/>
-diff -puN /dev/null Documentation/filesystems/reiser4.txt
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/Documentation/filesystems/reiser4.txt 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/Documentation/filesystems/reiser4.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/Documentation/filesystems/reiser4.txt 2006-11-19 02:58:40.278150237 +0000
@@ -0,0 +1,75 @@
+Reiser4 filesystem
+==================
@@ -128,10 +111,30 @@
+dont_load_bitmap
+ Don't load all bitmap blocks at mount time, it is useful for
+ machines with tiny RAM and large disks.
-diff -puN fs/fs-writeback.c~reiser4-for-2.6.17-3 fs/fs-writeback.c
---- linux-2.6.17/fs/fs-writeback.c~reiser4-for-2.6.17-3 2006-07-28 22:21:06.000000000 +0400
-+++ linux-2.6.17-vs/fs/fs-writeback.c 2006-07-28 22:21:06.000000000 +0400
-@@ -286,8 +286,6 @@ __writeback_single_inode(struct inode *i
+--- linux-2.6.18.orig/fs/Kconfig 2006-11-19 02:58:23.771150237 +0000
++++ linux-2.6.18.reiser4/fs/Kconfig 2006-11-19 02:58:40.284150237 +0000
+@@ -177,6 +177,8 @@
+ default y if EXT2_FS=y || EXT3_FS=y
+ default m if EXT2_FS=m || EXT3_FS=m
+
++source "fs/reiser4/Kconfig"
++
+ config REISERFS_FS
+ tristate "Reiserfs support"
+ help
+--- linux-2.6.18.orig/fs/Makefile 2006-09-20 03:42:06.000000000 +0000
++++ linux-2.6.18.reiser4/fs/Makefile 2006-11-19 02:58:40.285150237 +0000
+@@ -53,6 +53,7 @@
+
+ # Do not add any filesystems before this line
+ obj-$(CONFIG_REISERFS_FS) += reiserfs/
++obj-$(CONFIG_REISER4_FS) += reiser4/
+ obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3
+ obj-$(CONFIG_JBD) += jbd/
+ obj-$(CONFIG_EXT2_FS) += ext2/
+--- linux-2.6.18.orig/fs/fs-writeback.c 2006-09-20 03:42:06.000000000 +0000
++++ linux-2.6.18.reiser4/fs/fs-writeback.c 2006-11-19 02:58:41.335150237 +0000
+@@ -286,8 +286,6 @@
* WB_SYNC_HOLD is a hack for sys_sync(): reattach the inode to sb->s_dirty so
* that it can be located for waiting on in __writeback_single_inode().
*
@@ -140,7 +143,7 @@
* If `bdi' is non-zero then we're being asked to writeback a specific queue.
* This function assumes that the blockdev superblock's inodes are backed by
* a variety of queues, so all inodes are searched. For other superblocks,
-@@ -303,11 +301,13 @@ __writeback_single_inode(struct inode *i
+@@ -303,11 +301,13 @@
* on the writer throttling path, and we get decent balancing between many
* throttled threads: we don't want them all piling up on __wait_on_inode.
*/
@@ -156,7 +159,7 @@
if (!wbc->for_kupdate || list_empty(&sb->s_io))
list_splice_init(&sb->s_dirty, &sb->s_io);
-@@ -387,8 +387,19 @@ sync_sb_inodes(struct super_block *sb, s
+@@ -387,8 +387,19 @@
if (wbc->nr_to_write <= 0)
break;
}
@@ -176,7 +179,7 @@
/*
* Start writeback of dirty pagecache data against all unlocked inodes.
-@@ -429,11 +440,8 @@ restart:
+@@ -429,11 +440,8 @@
* be unmounted by the time it is released.
*/
if (down_read_trylock(&sb->s_umount)) {
@@ -189,7 +192,7 @@
up_read(&sb->s_umount);
}
spin_lock(&sb_lock);
-@@ -469,9 +477,7 @@ void sync_inodes_sb(struct super_block *
+@@ -471,9 +479,7 @@
(inodes_stat.nr_inodes - inodes_stat.nr_unused) +
nr_dirty + nr_unstable;
wbc.nr_to_write += wbc.nr_to_write / 2; /* Bit more for luck */
@@ -199,33 +202,274 @@
}
/*
-diff -puN fs/Kconfig~reiser4-for-2.6.17-3 fs/Kconfig
---- linux-2.6.17/fs/Kconfig~reiser4-for-2.6.17-3 2006-07-28 22:21:06.000000000 +0400
-+++ linux-2.6.17-vs/fs/Kconfig 2006-07-28 22:21:06.000000000 +0400
-@@ -177,6 +177,8 @@ config FS_MBCACHE
- default y if EXT2_FS=y || EXT3_FS=y
- default m if EXT2_FS=m || EXT3_FS=m
-
-+source "fs/reiser4/Kconfig"
+--- linux-2.6.18.orig/fs/reiser4/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/Kconfig 2006-11-19 02:58:40.286150237 +0000
+@@ -0,0 +1,31 @@
++config REISER4_FS
++ tristate "Reiser4 (EXPERIMENTAL)"
++ depends on EXPERIMENTAL
++ select ZLIB_INFLATE
++ select ZLIB_DEFLATE
++ help
++ Reiser4 is a filesystem that performs all filesystem operations
++ as atomic transactions, which means that it either performs a
++ write, or it does not, and in the event of a crash it does not
++ partially perform it or corrupt it.
+
- config REISERFS_FS
- tristate "Reiserfs support"
- help
-diff -puN fs/Makefile~reiser4-for-2.6.17-3 fs/Makefile
---- linux-2.6.17/fs/Makefile~reiser4-for-2.6.17-3 2006-07-28 22:21:06.000000000 +0400
-+++ linux-2.6.17-vs/fs/Makefile 2006-07-28 22:21:06.000000000 +0400
-@@ -52,6 +52,7 @@ obj-$(CONFIG_PROFILING) += dcookies.o
-
- # Do not add any filesystems before this line
- obj-$(CONFIG_REISERFS_FS) += reiserfs/
-+obj-$(CONFIG_REISER4_FS) += reiser4/
- obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3
- obj-$(CONFIG_JBD) += jbd/
- obj-$(CONFIG_EXT2_FS) += ext2/
-diff -puN /dev/null fs/reiser4/as_ops.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/as_ops.c 2006-07-28 22:24:03.000000000 +0400
-@@ -0,0 +1,390 @@
++ It stores files in dancing trees, which are like balanced trees but
++ faster. It packs small files together so that they share blocks
++ without wasting space. This means you can use it to store really
++ small files. It also means that it saves you disk space. It avoids
++ hassling you with anachronisms like having a maximum number of
++ inodes, and wasting space if you use less than that number.
++
++ Reiser4 is a distinct filesystem type from reiserfs (V3).
++ It's therefore not possible to use reiserfs file systems
++ with reiser4.
++
++ To learn more about reiser4, go to http://www.namesys.com
++
++config REISER4_DEBUG
++ bool "Enable reiser4 debug mode"
++ depends on REISER4_FS
++ help
++ Don't use this unless you are debugging reiser4.
++
++ If unsure, say N.
+--- linux-2.6.18.orig/fs/reiser4/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/Makefile 2006-11-19 02:58:40.287150237 +0000
+@@ -0,0 +1,100 @@
++#
++# reiser4/Makefile
++#
++
++obj-$(CONFIG_REISER4_FS) += reiser4.o
++
++reiser4-y := \
++ debug.o \
++ jnode.o \
++ znode.o \
++ key.o \
++ pool.o \
++ tree_mod.o \
++ estimate.o \
++ carry.o \
++ carry_ops.o \
++ lock.o \
++ tree.o \
++ context.o \
++ tap.o \
++ coord.o \
++ block_alloc.o \
++ txnmgr.o \
++ kassign.o \
++ flush.o \
++ wander.o \
++ eottl.o \
++ search.o \
++ page_cache.o \
++ seal.o \
++ dscale.o \
++ flush_queue.o \
++ ktxnmgrd.o \
++ blocknrset.o \
++ super.o \
++ super_ops.o \
++ fsdata.o \
++ export_ops.o \
++ oid.o \
++ tree_walk.o \
++ inode.o \
++ vfs_ops.o \
++ as_ops.o \
++ entd.o\
++ readahead.o \
++ status_flags.o \
++ init_super.o \
++ safe_link.o \
++ \
++ plugin/plugin.o \
++ plugin/plugin_set.o \
++ plugin/node/node.o \
++ plugin/object.o \
++ plugin/cluster.o \
++ plugin/inode_ops.o \
++ plugin/inode_ops_rename.o \
++ plugin/file_ops.o \
++ plugin/file_ops_readdir.o \
++ plugin/file_plugin_common.o \
++ plugin/file/file.o \
++ plugin/file/tail_conversion.o \
++ plugin/file/symlink.o \
++ plugin/file/cryptcompress.o \
++ plugin/dir_plugin_common.o \
++ plugin/dir/hashed_dir.o \
++ plugin/dir/seekable_dir.o \
++ plugin/node/node40.o \
++ \
++ plugin/crypto/cipher.o \
++ plugin/crypto/digest.o \
++ \
++ plugin/compress/minilzo.o \
++ plugin/compress/compress.o \
++ plugin/compress/compress_mode.o \
++ \
++ plugin/item/static_stat.o \
++ plugin/item/sde.o \
++ plugin/item/cde.o \
++ plugin/item/blackbox.o \
++ plugin/item/internal.o \
++ plugin/item/tail.o \
++ plugin/item/ctail.o \
++ plugin/item/extent.o \
++ plugin/item/extent_item_ops.o \
++ plugin/item/extent_file_ops.o \
++ plugin/item/extent_flush_ops.o \
++ \
++ plugin/hash.o \
++ plugin/fibration.o \
++ plugin/tail_policy.o \
++ plugin/item/item.o \
++ \
++ plugin/security/perm.o \
++ plugin/space/bitmap.o \
++ \
++ plugin/disk_format/disk_format40.o \
++ plugin/disk_format/disk_format.o \
++ \
++ plugin/regular.o
++
+--- linux-2.6.18.orig/fs/reiser4/README 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/README 2006-11-19 02:58:40.290150237 +0000
+@@ -0,0 +1,125 @@
++[LICENSING]
++
++Reiser4 is hereby licensed under the GNU General
++Public License version 2.
++
++Source code files that contain the phrase "licensing governed by
++reiser4/README" are "governed files" throughout this file. Governed
++files are licensed under the GPL. The portions of them owned by Hans
++Reiser, or authorized to be licensed by him, have been in the past,
++and likely will be in the future, licensed to other parties under
++other licenses. If you add your code to governed files, and don't
++want it to be owned by Hans Reiser, put your copyright label on that
++code so the poor blight and his customers can keep things straight.
++All portions of governed files not labeled otherwise are owned by Hans
++Reiser, and by adding your code to it, widely distributing it to
++others or sending us a patch, and leaving the sentence in stating that
++licensing is governed by the statement in this file, you accept this.
++It will be a kindness if you identify whether Hans Reiser is allowed
++to license code labeled as owned by you on your behalf other than
++under the GPL, because he wants to know if it is okay to do so and put
++a check in the mail to you (for non-trivial improvements) when he
++makes his next sale. He makes no guarantees as to the amount if any,
++though he feels motivated to motivate contributors, and you can surely
++discuss this with him before or after contributing. You have the
++right to decline to allow him to license your code contribution other
++than under the GPL.
++
++Further licensing options are available for commercial and/or other
++interests directly from Hans Reiser: reiser at namesys.com. If you interpret
++the GPL as not allowing those additional licensing options, you read
++it wrongly, and Richard Stallman agrees with me, when carefully read
++you can see that those restrictions on additional terms do not apply
++to the owner of the copyright, and my interpretation of this shall
++govern for this license.
++
++[END LICENSING]
++
++Reiser4 is a file system based on dancing tree algorithms, and is
++described at http://www.namesys.com
++
++mkfs.reiser4 and other utilities are on our webpage or wherever your
++Linux provider put them. You really want to be running the latest
++version off the website if you use fsck.
++
++Yes, if you update your reiser4 kernel module you do have to
++recompile your kernel, most of the time. The errors you get will be
++quite cryptic if your forget to do so.
++
++Hideous Commercial Pitch: Spread your development costs across other OS
++vendors. Select from the best in the world, not the best in your
++building, by buying from third party OS component suppliers. Leverage
++the software component development power of the internet. Be the most
++aggressive in taking advantage of the commercial possibilities of
++decentralized internet development, and add value through your branded
++integration that you sell as an operating system. Let your competitors
++be the ones to compete against the entire internet by themselves. Be
++hip, get with the new economic trend, before your competitors do. Send
++email to reiser at namesys.com
++
++Hans Reiser was the primary architect of Reiser4, but a whole team
++chipped their ideas in. He invested everything he had into Namesys
++for 5.5 dark years of no money before Reiser3 finally started to work well
++enough to bring in money. He owns the copyright.
++
++DARPA was the primary sponsor of Reiser4. DARPA does not endorse
++Reiser4, it merely sponsors it. DARPA is, in solely Hans's personal
++opinion, unique in its willingness to invest into things more
++theoretical than the VC community can readily understand, and more
++longterm than allows them to be sure that they will be the ones to
++extract the economic benefits from. DARPA also integrated us into a
++security community that transformed our security worldview.
++
++Vladimir Saveliev is our lead programmer, with us from the beginning,
++and he worked long hours writing the cleanest code. This is why he is
++now the lead programmer after years of commitment to our work. He
++always made the effort to be the best he could be, and to make his
++code the best that it could be. What resulted was quite remarkable. I
++don't think that money can ever motivate someone to work the way he
++did, he is one of the most selfless men I know.
++
++Alexander Lyamin was our sysadmin, and helped to educate us in
++security issues. Moscow State University and IMT were very generous
++in the internet access they provided us, and in lots of other little
++ways that a generous institution can be.
++
++Alexander Zarochentcev (sometimes known as zam, or sasha), wrote the
++locking code, the block allocator, and finished the flushing code.
++His code is always crystal clean and well structured.
++
++Nikita Danilov wrote the core of the balancing code, the core of the
++plugins code, and the directory code. He worked a steady pace of long
++hours that produced a whole lot of well abstracted code. He is our
++senior computer scientist.
++
++Vladimir Demidov wrote the parser. Writing an in kernel parser is
++something very few persons have the skills for, and it is thanks to
++him that we can say that the parser is really not so big compared to
++various bits of our other code, and making a parser work in the kernel
++was not so complicated as everyone would imagine mainly because it was
++him doing it...
++
++Joshua McDonald wrote the transaction manager, and the flush code.
++The flush code unexpectedly turned out be extremely hairy for reasons
++you can read about on our web page, and he did a great job on an
++extremely difficult task.
++
++Nina Reiser handled our accounting, government relations, and much
++more.
++
++Ramon Reiser developed our website.
++
++Beverly Palmer drew our graphics.
++
++Vitaly Fertman developed librepair, userspace plugins repair code, fsck
++and worked with Umka on developing libreiser4 and userspace plugins.
++
++Yury Umanets (aka Umka) developed libreiser4, userspace plugins and
++userspace tools (reiser4progs).
++
++Oleg Drokin (aka Green) is the release manager who fixes everything.
++It is so nice to have someone like that on the team. He (plus Chris
++and Jeff) make it possible for the entire rest of the Namesys team to
++focus on Reiser4, and he fixed a whole lot of Reiser4 bugs also. It
++is just amazing to watch his talent for spotting bugs in action.
++
+--- linux-2.6.18.orig/fs/reiser4/as_ops.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/as_ops.c 2006-11-19 02:58:41.369150237 +0000
+@@ -0,0 +1,389 @@
+/* Copyright 2003 by Hans Reiser, licensing governed by reiser4/README */
+
+/* Interface to VFS. Reiser4 address_space_operations are defined here. */
@@ -311,7 +555,8 @@
+ if (page->mapping) {
+ assert("vs-1652", page->mapping == mapping);
+ if (mapping_cap_account_dirty(mapping))
-+ inc_page_state(nr_dirty);
++ inc_zone_page_state(page,
++ NR_FILE_DIRTY);
+ radix_tree_tag_set(&mapping->page_tree,
+ page->index,
+ PAGECACHE_TAG_REISER4_MOVED);
@@ -568,8 +813,6 @@
+ /* NOTE-NIKITA: this can be called in the context of reiser4 call. It
+ is not clear what to do in this case. A lot of deadlocks seems be
+ possible. */
-+ if (page_count(page) > 3)
-+ return 0;
+
+ node = jnode_by_page(page);
+ assert("nikita-2258", node != NULL);
@@ -616,9 +859,8 @@
+ fill-column: 120
+ End:
+*/
-diff -puN /dev/null fs/reiser4/block_alloc.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/block_alloc.c 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/block_alloc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/block_alloc.c 2006-11-19 02:58:40.307150237 +0000
@@ -0,0 +1,1139 @@
+/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -1176,8 +1418,8 @@
+
+/* adjust sb block counters, if real (on-disk) block allocation immediately
+ follows grabbing of free disk space. */
-+static void grabbed2used(reiser4_context *ctx, reiser4_super_info_data *sbinfo,
-+ __u64 count)
++void grabbed2used(reiser4_context *ctx, reiser4_super_info_data *sbinfo,
++ __u64 count)
+{
+ sub_from_ctx_grabbed(ctx, count);
+
@@ -1192,8 +1434,8 @@
+}
+
+/* adjust sb block counters when @count unallocated blocks get mapped to disk */
-+static void fake_allocated2used(reiser4_super_info_data *sbinfo, __u64 count,
-+ reiser4_ba_flags_t flags)
++void fake_allocated2used(reiser4_super_info_data *sbinfo, __u64 count,
++ reiser4_ba_flags_t flags)
+{
+ spin_lock_reiser4_super(sbinfo);
+
@@ -1205,7 +1447,7 @@
+ spin_unlock_reiser4_super(sbinfo);
+}
+
-+static void flush_reserved2used(txn_atom * atom, __u64 count)
++void flush_reserved2used(txn_atom * atom, __u64 count)
+{
+ reiser4_super_info_data *sbinfo;
+
@@ -1759,9 +2001,8 @@
+ scroll-step: 1
+ End:
+*/
-diff -puN /dev/null fs/reiser4/block_alloc.h
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/block_alloc.h 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/block_alloc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/block_alloc.h 2006-11-19 02:58:40.310150237 +0000
@@ -0,0 +1,175 @@
+/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -1938,9 +2179,8 @@
+ fill-column: 120
+ End:
+*/
-diff -puN /dev/null fs/reiser4/blocknrset.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/blocknrset.c 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/blocknrset.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/blocknrset.c 2006-11-19 02:58:40.316150237 +0000
@@ -0,0 +1,368 @@
+/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -2310,9 +2550,8 @@
+ * scroll-step: 1
+ * End:
+ */
-diff -puN /dev/null fs/reiser4/carry.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/carry.c 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/carry.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/carry.c 2006-11-19 02:58:40.331150237 +0000
@@ -0,0 +1,1381 @@
+/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+/* Functions to "carry" tree modification(s) upward. */
@@ -3695,9 +3934,8 @@
+ scroll-step: 1
+ End:
+*/
-diff -puN /dev/null fs/reiser4/carry.h
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/carry.h 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/carry.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/carry.h 2006-11-19 02:58:40.336150237 +0000
@@ -0,0 +1,442 @@
+/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -4141,9 +4379,8 @@
+ scroll-step: 1
+ End:
+*/
-diff -puN /dev/null fs/reiser4/carry_ops.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/carry_ops.c 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/carry_ops.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/carry_ops.c 2006-11-19 02:58:40.373150237 +0000
@@ -0,0 +1,2103 @@
+/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -6248,9 +6485,8 @@
+ scroll-step: 1
+ End:
+*/
-diff -puN /dev/null fs/reiser4/carry_ops.h
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/carry_ops.h 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/carry_ops.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/carry_ops.h 2006-11-19 02:58:40.375150237 +0000
@@ -0,0 +1,42 @@
+/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -6294,9 +6530,8 @@
+ scroll-step: 1
+ End:
+*/
-diff -puN /dev/null fs/reiser4/context.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/context.c 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/context.c 2006-11-19 02:58:40.378150237 +0000
@@ -0,0 +1,278 @@
+/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */
+
@@ -6576,9 +6811,8 @@
+ * scroll-step: 1
+ * End:
+ */
-diff -puN /dev/null fs/reiser4/context.h
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
-+++ linux-2.6.17-vs/fs/reiser4/context.h 2006-07-28 22:21:06.000000000 +0400
+--- linux-2.6.18.orig/fs/reiser4/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.18.reiser4/fs/reiser4/context.h 2006-11-19 02:58:40.381150237 +0000
@@ -0,0 +1,228 @@
+/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by
+ * reiser4/README */
@@ -6808,9 +7042,8 @@
+ scroll-step: 1
+ End:
+*/
-diff -puN /dev/null fs/reiser4/coord.c
---- /dev/null 2005-09-09 20:40:41.000000000 +0400
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-desktop-reiser4.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list