From: Arkadiusz Miśkiewicz Date: Fri, 28 May 2010 08:56:26 +0000 (+0000) Subject: - reiser4 patch updated X-Git-Tag: auto/th/kernel-2_6_34_1-0_1~10 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=edee36668229891df75a3d660a3c8b05c31a06e5;p=packages%2Fkernel.git - reiser4 patch updated Changed files: kernel-reiser4.patch -> 1.12 kernel.spec -> 1.790 --- diff --git a/kernel-reiser4.patch b/kernel-reiser4.patch index 6e007ca7..fa3ec067 100644 --- a/kernel-reiser4.patch +++ b/kernel-reiser4.patch @@ -1,6 +1,6 @@ -diff -urN linux-2.6.33.orig/Documentation/Changes linux-2.6.33/Documentation/Changes ---- linux-2.6.33.orig/Documentation/Changes 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/Documentation/Changes 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/Documentation/Changes linux-2.6.34/Documentation/Changes +--- linux-2.6.34.orig/Documentation/Changes 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/Documentation/Changes 2010-05-27 02:44:03.683662124 +0200 @@ -36,6 +36,7 @@ o e2fsprogs 1.41.4 # e2fsck -V o jfsutils 1.1.3 # fsck.jfs -V @@ -34,9 +34,9 @@ diff -urN linux-2.6.33.orig/Documentation/Changes linux-2.6.33/Documentation/Cha Xfsprogs -------- o -diff -urN linux-2.6.33.orig/Documentation/filesystems/reiser4.txt linux-2.6.33/Documentation/filesystems/reiser4.txt ---- linux-2.6.33.orig/Documentation/filesystems/reiser4.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/Documentation/filesystems/reiser4.txt 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/Documentation/filesystems/reiser4.txt linux-2.6.34/Documentation/filesystems/reiser4.txt +--- linux-2.6.34.orig/Documentation/filesystems/reiser4.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/Documentation/filesystems/reiser4.txt 2010-05-27 02:44:03.686899352 +0200 @@ -0,0 +1,75 @@ +Reiser4 filesystem +================== @@ -113,165 +113,26 @@ diff -urN linux-2.6.33.orig/Documentation/filesystems/reiser4.txt linux-2.6.33/D +dont_load_bitmap + Don't load all bitmap blocks at mount time, it is useful for + machines with tiny RAM and large disks. -diff -urN linux-2.6.33.orig/fs/fs-writeback.c linux-2.6.33/fs/fs-writeback.c ---- linux-2.6.33.orig/fs/fs-writeback.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/fs/fs-writeback.c 2010-03-04 20:21:39.000000000 +0100 -@@ -549,108 +549,85 @@ - return ret; - } - --static void unpin_sb_for_writeback(struct super_block **psb) -+static void unpin_sb_for_writeback(struct super_block *sb) - { -- struct super_block *sb = *psb; -- -- if (sb) { -- up_read(&sb->s_umount); -- put_super(sb); -- *psb = NULL; -- } -+ up_read(&sb->s_umount); -+ put_super(sb); - } - -+enum sb_pin_state { -+ SB_PINNED, -+ SB_NOT_PINNED, -+ SB_PIN_FAILED -+}; -+ - /* - * For WB_SYNC_NONE writeback, the caller does not have the sb pinned - * before calling writeback. So make sure that we do pin it, so it doesn't - * go away while we are writing inodes from it. -- * -- * Returns 0 if the super was successfully pinned (or pinning wasn't needed), -- * 1 if we failed. +diff -urN linux-2.6.34.orig/fs/fs-writeback.c linux-2.6.34/fs/fs-writeback.c +--- linux-2.6.34.orig/fs/fs-writeback.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/fs/fs-writeback.c 2010-05-27 02:44:03.687899305 +0200 +@@ -606,9 +606,9 @@ + * Return 1, if the caller writeback routine should be + * interrupted. Otherwise return 0. */ --static int pin_sb_for_writeback(struct writeback_control *wbc, -- struct inode *inode, struct super_block **psb) -+static enum sb_pin_state pin_sb_for_writeback(struct writeback_control *wbc, -+ struct super_block *sb) - { -- struct super_block *sb = inode->i_sb; -- -- /* -- * If this sb is already pinned, nothing more to do. If not and -- * *psb is non-NULL, unpin the old one first -- */ -- if (sb == *psb) -- return 0; -- else if (*psb) -- unpin_sb_for_writeback(psb); -- - /* - * Caller must already hold the ref for this - */ - if (wbc->sync_mode == WB_SYNC_ALL) { - WARN_ON(!rwsem_is_locked(&sb->s_umount)); -- return 0; -+ return SB_NOT_PINNED; - } -- - spin_lock(&sb_lock); - sb->s_count++; - if (down_read_trylock(&sb->s_umount)) { - if (sb->s_root) { - spin_unlock(&sb_lock); -- goto pinned; -+ return SB_PINNED; - } - /* - * umounted, drop rwsem again and fall through to failure - */ - up_read(&sb->s_umount); - } -- - sb->s_count--; - spin_unlock(&sb_lock); -- return 1; --pinned: -- *psb = sb; -- return 0; -+ return SB_PIN_FAILED; - } - --static void writeback_inodes_wb(struct bdi_writeback *wb, -+/* -+ * Write a portion of b_io inodes which belong to @sb. -+ * If @wbc->sb != NULL, then find and write all such -+ * inodes. Otherwise write only ones which go sequentially -+ * in reverse order. -+ * Return 1, if the caller writeback routine should be -+ * interrupted. Otherwise return 0. -+ */ +-static int writeback_sb_inodes(struct super_block *sb, +- struct bdi_writeback *wb, +- struct writeback_control *wbc) +int generic_writeback_sb_inodes(struct super_block *sb, + struct bdi_writeback *wb, - struct writeback_control *wbc) ++ struct writeback_control *wbc) { -- struct super_block *sb = wbc->sb, *pin_sb = NULL; -- const unsigned long start = jiffies; /* livelock avoidance */ -- -- spin_lock(&inode_lock); -- -- if (!wbc->for_kupdate || list_empty(&wb->b_io)) -- queue_io(wb, wbc->older_than_this); -- while (!list_empty(&wb->b_io)) { -- struct inode *inode = list_entry(wb->b_io.prev, -- struct inode, i_list); long pages_skipped; -- -- /* -- * super block given and doesn't match, skip this inode -- */ -- if (sb && sb != inode->i_sb) { -+ struct inode *inode = list_entry(wb->b_io.prev, -+ struct inode, i_list); -+ if (wbc->sb && sb != inode->i_sb) { -+ /* super block given and doesn't -+ match, skip this inode */ - redirty_tail(inode); - continue; - } -- -+ if (sb != inode->i_sb) -+ /* finish with this superblock */ -+ return 0; - if (inode->i_state & (I_NEW | I_WILL_FREE)) { - requeue_io(inode); - continue; - } -- - /* - * Was this inode dirtied after sync_sb_inodes was called? - * This keeps sync from extra jobs and livelock. - */ -- if (inode_dirtied_after(inode, start)) -- break; -- -- if (pin_sb_for_writeback(wbc, inode, &pin_sb)) { -- requeue_io(inode); -- continue; -- } -+ if (inode_dirtied_after(inode, wbc->wb_start)) -+ return 1; - - BUG_ON(inode->i_state & (I_FREEING | I_CLEAR)); - __iget(inode); -@@ -669,14 +646,78 @@ - spin_lock(&inode_lock); - if (wbc->nr_to_write <= 0) { - wbc->more_io = 1; -- break; -+ return 1; - } - if (!list_empty(&wb->b_more_io)) - wbc->more_io = 1; - } -+ /* b_io is empty */ -+ return 1; -+} +@@ -659,6 +659,32 @@ + /* b_io is empty */ + return 1; + } +EXPORT_SYMBOL(generic_writeback_sb_inodes); + +/* @@ -297,50 +158,23 @@ diff -urN linux-2.6.33.orig/fs/fs-writeback.c linux-2.6.33/fs/fs-writeback.c + } +} +EXPORT_SYMBOL(writeback_skip_sb_inodes); - -- unpin_sb_for_writeback(&pin_sb); -+static void writeback_inodes_wb(struct bdi_writeback *wb, -+ struct writeback_control *wbc) -+{ -+ int ret = 0; - -+ wbc->wb_start = jiffies; /* livelock avoidance */ -+ spin_lock(&inode_lock); -+ if (!wbc->for_kupdate || list_empty(&wb->b_io)) -+ queue_io(wb, wbc->older_than_this); -+ -+ while (!list_empty(&wb->b_io)) { -+ struct inode *inode = list_entry(wb->b_io.prev, -+ struct inode, i_list); -+ struct super_block *sb = inode->i_sb; -+ enum sb_pin_state state; -+ -+ if (wbc->sb && sb != wbc->sb) { -+ /* super block given and doesn't -+ match, skip this inode */ -+ redirty_tail(inode); -+ continue; -+ } -+ state = pin_sb_for_writeback(wbc, sb); + -+ if (state == SB_PIN_FAILED) { -+ requeue_io(inode); -+ continue; -+ } -+ if (sb->s_op->writeback_inodes) -+ ret = sb->s_op->writeback_inodes(sb, wb, wbc); -+ else + + static void writeback_inodes_wb(struct bdi_writeback *wb, + struct writeback_control *wbc) +@@ -688,7 +714,10 @@ + requeue_io(inode); + continue; + } +- ret = writeback_sb_inodes(sb, wb, wbc); ++ if (sb->s_op->writeback_inodes) ++ ret = sb->s_op->writeback_inodes(sb, wb, wbc); ++ else + ret = generic_writeback_sb_inodes(sb, wb, wbc); -+ -+ if (state == SB_PINNED) -+ unpin_sb_for_writeback(sb); -+ if (ret) -+ break; -+ } - spin_unlock(&inode_lock); - /* Leave any unwritten inodes on b_io */ - } -@@ -687,6 +728,7 @@ + + if (state == SB_PINNED) + unpin_sb_for_writeback(sb); +@@ -705,6 +734,7 @@ writeback_inodes_wb(&bdi->wb, wbc); } @@ -348,7 +182,7 @@ diff -urN linux-2.6.33.orig/fs/fs-writeback.c linux-2.6.33/fs/fs-writeback.c /* * The maximum number of pages to writeout in a single bdi flush/kupdate -@@ -1272,3 +1314,12 @@ +@@ -1290,3 +1320,12 @@ return ret; } EXPORT_SYMBOL(sync_inode); @@ -361,10 +195,10 @@ diff -urN linux-2.6.33.orig/fs/fs-writeback.c linux-2.6.33/fs/fs-writeback.c + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/inode.c linux-2.6.33/fs/inode.c ---- linux-2.6.33.orig/fs/inode.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/fs/inode.c 2010-03-04 19:33:22.000000000 +0100 -@@ -85,6 +85,7 @@ +diff -urN linux-2.6.34.orig/fs/inode.c linux-2.6.34/fs/inode.c +--- linux-2.6.34.orig/fs/inode.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/fs/inode.c 2010-05-27 02:44:03.688672248 +0200 +@@ -84,6 +84,7 @@ * the i_state of an inode while it is in use.. */ DEFINE_SPINLOCK(inode_lock); @@ -372,9 +206,9 @@ diff -urN linux-2.6.33.orig/fs/inode.c linux-2.6.33/fs/inode.c /* * iprune_sem provides exclusion between the kswapd or try_to_free_pages -diff -urN linux-2.6.33.orig/fs/Kconfig linux-2.6.33/fs/Kconfig ---- linux-2.6.33.orig/fs/Kconfig 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/fs/Kconfig 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/Kconfig linux-2.6.34/fs/Kconfig +--- linux-2.6.34.orig/fs/Kconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/fs/Kconfig 2010-05-27 02:44:03.688672248 +0200 @@ -27,6 +27,7 @@ default y if EXT4_FS=y && EXT4_FS_XATTR default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR @@ -383,9 +217,9 @@ diff -urN linux-2.6.33.orig/fs/Kconfig linux-2.6.33/fs/Kconfig source "fs/reiserfs/Kconfig" source "fs/jfs/Kconfig" -diff -urN linux-2.6.33.orig/fs/Makefile linux-2.6.33/fs/Makefile ---- linux-2.6.33.orig/fs/Makefile 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/fs/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/Makefile linux-2.6.34/fs/Makefile +--- linux-2.6.34.orig/fs/Makefile 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/fs/Makefile 2010-05-27 02:44:03.689899622 +0200 @@ -65,6 +65,7 @@ # Do not add any filesystems before this line obj-$(CONFIG_FSCACHE) += fscache/ @@ -394,9 +228,9 @@ diff -urN linux-2.6.33.orig/fs/Makefile linux-2.6.33/fs/Makefile obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3 obj-$(CONFIG_EXT2_FS) += ext2/ # We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2 -diff -urN linux-2.6.33.orig/fs/reiser4/as_ops.c linux-2.6.33/fs/reiser4/as_ops.c ---- linux-2.6.33.orig/fs/reiser4/as_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/as_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/as_ops.c linux-2.6.34/fs/reiser4/as_ops.c +--- linux-2.6.34.orig/fs/reiser4/as_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/as_ops.c 2010-05-27 02:44:03.689899622 +0200 @@ -0,0 +1,337 @@ +/* Copyright 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -735,9 +569,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/as_ops.c linux-2.6.33/fs/reiser4/as_ops.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/block_alloc.c linux-2.6.33/fs/reiser4/block_alloc.c ---- linux-2.6.33.orig/fs/reiser4/block_alloc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/block_alloc.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/block_alloc.c linux-2.6.34/fs/reiser4/block_alloc.c +--- linux-2.6.34.orig/fs/reiser4/block_alloc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/block_alloc.c 2010-05-27 02:44:03.691899786 +0200 @@ -0,0 +1,1142 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by +reiser4/README */ @@ -1881,9 +1715,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/block_alloc.c linux-2.6.33/fs/reiser4/blo + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/block_alloc.h linux-2.6.33/fs/reiser4/block_alloc.h ---- linux-2.6.33.orig/fs/reiser4/block_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/block_alloc.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/block_alloc.h linux-2.6.34/fs/reiser4/block_alloc.h +--- linux-2.6.34.orig/fs/reiser4/block_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/block_alloc.h 2010-05-27 02:44:03.691899786 +0200 @@ -0,0 +1,177 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -2062,9 +1896,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/block_alloc.h linux-2.6.33/fs/reiser4/blo + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/blocknrset.c linux-2.6.33/fs/reiser4/blocknrset.c ---- linux-2.6.33.orig/fs/reiser4/blocknrset.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/blocknrset.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/blocknrset.c linux-2.6.34/fs/reiser4/blocknrset.c +--- linux-2.6.34.orig/fs/reiser4/blocknrset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/blocknrset.c 2010-05-27 02:44:03.692676003 +0200 @@ -0,0 +1,371 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by +reiser4/README */ @@ -2437,9 +2271,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/blocknrset.c linux-2.6.33/fs/reiser4/bloc + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/carry.c linux-2.6.33/fs/reiser4/carry.c ---- linux-2.6.33.orig/fs/reiser4/carry.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/carry.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/carry.c linux-2.6.34/fs/reiser4/carry.c +--- linux-2.6.34.orig/fs/reiser4/carry.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/carry.c 2010-05-27 02:44:03.693899313 +0200 @@ -0,0 +1,1398 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -3839,9 +3673,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/carry.c linux-2.6.33/fs/reiser4/carry.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/carry.h linux-2.6.33/fs/reiser4/carry.h ---- linux-2.6.33.orig/fs/reiser4/carry.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/carry.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/carry.h linux-2.6.34/fs/reiser4/carry.h +--- linux-2.6.34.orig/fs/reiser4/carry.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/carry.h 2010-05-27 02:44:03.694524376 +0200 @@ -0,0 +1,445 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -4288,9 +4122,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/carry.h linux-2.6.33/fs/reiser4/carry.h + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/carry_ops.c linux-2.6.33/fs/reiser4/carry_ops.c ---- linux-2.6.33.orig/fs/reiser4/carry_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/carry_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/carry_ops.c linux-2.6.34/fs/reiser4/carry_ops.c +--- linux-2.6.34.orig/fs/reiser4/carry_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/carry_ops.c 2010-05-27 02:44:03.695899248 +0200 @@ -0,0 +1,2132 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -6424,9 +6258,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/carry_ops.c linux-2.6.33/fs/reiser4/carry + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/carry_ops.h linux-2.6.33/fs/reiser4/carry_ops.h ---- linux-2.6.33.orig/fs/reiser4/carry_ops.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/carry_ops.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/carry_ops.h linux-2.6.34/fs/reiser4/carry_ops.h +--- linux-2.6.34.orig/fs/reiser4/carry_ops.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/carry_ops.h 2010-05-27 02:44:03.696694946 +0200 @@ -0,0 +1,43 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -6471,9 +6305,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/carry_ops.h linux-2.6.33/fs/reiser4/carry + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/context.c linux-2.6.33/fs/reiser4/context.c ---- linux-2.6.33.orig/fs/reiser4/context.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/context.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/context.c linux-2.6.34/fs/reiser4/context.c +--- linux-2.6.34.orig/fs/reiser4/context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/context.c 2010-05-27 02:44:03.696694946 +0200 @@ -0,0 +1,289 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -6764,9 +6598,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/context.c linux-2.6.33/fs/reiser4/context + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/context.h linux-2.6.33/fs/reiser4/context.h ---- linux-2.6.33.orig/fs/reiser4/context.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/context.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/context.h linux-2.6.34/fs/reiser4/context.h +--- linux-2.6.34.orig/fs/reiser4/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/context.h 2010-05-27 02:44:03.696694946 +0200 @@ -0,0 +1,228 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -6996,9 +6830,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/context.h linux-2.6.33/fs/reiser4/context + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/coord.c linux-2.6.33/fs/reiser4/coord.c ---- linux-2.6.33.orig/fs/reiser4/coord.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/coord.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/coord.c linux-2.6.34/fs/reiser4/coord.c +--- linux-2.6.34.orig/fs/reiser4/coord.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/coord.c 2010-05-27 02:44:03.697899455 +0200 @@ -0,0 +1,928 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -7928,9 +7762,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/coord.c linux-2.6.33/fs/reiser4/coord.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/coord.h linux-2.6.33/fs/reiser4/coord.h ---- linux-2.6.33.orig/fs/reiser4/coord.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/coord.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/coord.h linux-2.6.34/fs/reiser4/coord.h +--- linux-2.6.34.orig/fs/reiser4/coord.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/coord.h 2010-05-27 02:44:03.698671611 +0200 @@ -0,0 +1,399 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -8331,9 +8165,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/coord.h linux-2.6.33/fs/reiser4/coord.h + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/debug.c linux-2.6.33/fs/reiser4/debug.c ---- linux-2.6.33.orig/fs/reiser4/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/debug.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/debug.c linux-2.6.34/fs/reiser4/debug.c +--- linux-2.6.34.orig/fs/reiser4/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/debug.c 2010-05-27 02:44:03.698671611 +0200 @@ -0,0 +1,308 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -8643,9 +8477,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/debug.c linux-2.6.33/fs/reiser4/debug.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/debug.h linux-2.6.33/fs/reiser4/debug.h ---- linux-2.6.33.orig/fs/reiser4/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/debug.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/debug.h linux-2.6.34/fs/reiser4/debug.h +--- linux-2.6.34.orig/fs/reiser4/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/debug.h 2010-05-27 02:44:03.698671611 +0200 @@ -0,0 +1,351 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -8998,9 +8832,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/debug.h linux-2.6.33/fs/reiser4/debug.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/dformat.h linux-2.6.33/fs/reiser4/dformat.h ---- linux-2.6.33.orig/fs/reiser4/dformat.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/dformat.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/dformat.h linux-2.6.34/fs/reiser4/dformat.h +--- linux-2.6.34.orig/fs/reiser4/dformat.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/dformat.h 2010-05-27 02:44:03.699899164 +0200 @@ -0,0 +1,71 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -9073,9 +8907,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/dformat.h linux-2.6.33/fs/reiser4/dformat + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/dscale.c linux-2.6.33/fs/reiser4/dscale.c ---- linux-2.6.33.orig/fs/reiser4/dscale.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/dscale.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/dscale.c linux-2.6.34/fs/reiser4/dscale.c +--- linux-2.6.34.orig/fs/reiser4/dscale.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/dscale.c 2010-05-27 02:44:03.699899164 +0200 @@ -0,0 +1,192 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -9269,9 +9103,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/dscale.c linux-2.6.33/fs/reiser4/dscale.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/dscale.h linux-2.6.33/fs/reiser4/dscale.h ---- linux-2.6.33.orig/fs/reiser4/dscale.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/dscale.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/dscale.h linux-2.6.34/fs/reiser4/dscale.h +--- linux-2.6.34.orig/fs/reiser4/dscale.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/dscale.h 2010-05-27 02:44:03.700678301 +0200 @@ -0,0 +1,28 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -9301,9 +9135,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/dscale.h linux-2.6.33/fs/reiser4/dscale.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/entd.c linux-2.6.33/fs/reiser4/entd.c ---- linux-2.6.33.orig/fs/reiser4/entd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/entd.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/entd.c linux-2.6.34/fs/reiser4/entd.c +--- linux-2.6.34.orig/fs/reiser4/entd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/entd.c 2010-05-27 02:44:03.700678301 +0200 @@ -0,0 +1,338 @@ +/* Copyright 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -9643,9 +9477,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/entd.c linux-2.6.33/fs/reiser4/entd.c + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/entd.h linux-2.6.33/fs/reiser4/entd.h ---- linux-2.6.33.orig/fs/reiser4/entd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/entd.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/entd.h linux-2.6.34/fs/reiser4/entd.h +--- linux-2.6.34.orig/fs/reiser4/entd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/entd.h 2010-05-27 02:44:03.700678301 +0200 @@ -0,0 +1,90 @@ +/* Copyright 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -9737,9 +9571,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/entd.h linux-2.6.33/fs/reiser4/entd.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/eottl.c linux-2.6.33/fs/reiser4/eottl.c ---- linux-2.6.33.orig/fs/reiser4/eottl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/eottl.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/eottl.c linux-2.6.34/fs/reiser4/eottl.c +--- linux-2.6.34.orig/fs/reiser4/eottl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/eottl.c 2010-05-27 02:44:03.701899774 +0200 @@ -0,0 +1,510 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -10251,9 +10085,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/eottl.c linux-2.6.33/fs/reiser4/eottl.c + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/estimate.c linux-2.6.33/fs/reiser4/estimate.c ---- linux-2.6.33.orig/fs/reiser4/estimate.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/estimate.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/estimate.c linux-2.6.34/fs/reiser4/estimate.c +--- linux-2.6.34.orig/fs/reiser4/estimate.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/estimate.c 2010-05-27 02:44:03.701899774 +0200 @@ -0,0 +1,129 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -10384,9 +10218,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/estimate.c linux-2.6.33/fs/reiser4/estima + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/export_ops.c linux-2.6.33/fs/reiser4/export_ops.c ---- linux-2.6.33.orig/fs/reiser4/export_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/export_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/export_ops.c linux-2.6.34/fs/reiser4/export_ops.c +--- linux-2.6.34.orig/fs/reiser4/export_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/export_ops.c 2010-05-27 02:44:03.702671504 +0200 @@ -0,0 +1,328 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -10716,9 +10550,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/export_ops.c linux-2.6.33/fs/reiser4/expo + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/flush.c linux-2.6.33/fs/reiser4/flush.c ---- linux-2.6.33.orig/fs/reiser4/flush.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/flush.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/flush.c linux-2.6.34/fs/reiser4/flush.c +--- linux-2.6.34.orig/fs/reiser4/flush.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/flush.c 2010-05-27 02:44:03.704674545 +0200 @@ -0,0 +1,3703 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -14423,9 +14257,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/flush.c linux-2.6.33/fs/reiser4/flush.c + LocalWords: preceder + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/flush.h linux-2.6.33/fs/reiser4/flush.h ---- linux-2.6.33.orig/fs/reiser4/flush.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/flush.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/flush.h linux-2.6.34/fs/reiser4/flush.h +--- linux-2.6.34.orig/fs/reiser4/flush.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/flush.h 2010-05-27 02:44:03.705899150 +0200 @@ -0,0 +1,300 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -14727,9 +14561,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/flush.h linux-2.6.33/fs/reiser4/flush.h + LocalWords: preceder + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/flush_queue.c linux-2.6.33/fs/reiser4/flush_queue.c ---- linux-2.6.33.orig/fs/reiser4/flush_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/flush_queue.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/flush_queue.c linux-2.6.34/fs/reiser4/flush_queue.c +--- linux-2.6.34.orig/fs/reiser4/flush_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/flush_queue.c 2010-05-27 02:44:03.705899150 +0200 @@ -0,0 +1,678 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -15409,9 +15243,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/flush_queue.c linux-2.6.33/fs/reiser4/flu + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/forward.h linux-2.6.33/fs/reiser4/forward.h ---- linux-2.6.33.orig/fs/reiser4/forward.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/forward.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/forward.h linux-2.6.34/fs/reiser4/forward.h +--- linux-2.6.34.orig/fs/reiser4/forward.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/forward.h 2010-05-27 02:44:03.706899270 +0200 @@ -0,0 +1,256 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -15571,9 +15405,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/forward.h linux-2.6.33/fs/reiser4/forward + RIGHT_SIDE +} sideof; + -+#define round_up(value, order) \ ++#define reiser4_round_up(value, order) \ + ((typeof(value))(((long) (value) + (order) - 1U) & \ -+ ~((order) - 1))) ++ ~((order) - 1))) + +/* values returned by squalloc_right_neighbor and its auxiliary functions */ +typedef enum { @@ -15669,9 +15503,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/forward.h linux-2.6.33/fs/reiser4/forward + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/fsdata.c linux-2.6.33/fs/reiser4/fsdata.c ---- linux-2.6.33.orig/fs/reiser4/fsdata.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/fsdata.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/fsdata.c linux-2.6.34/fs/reiser4/fsdata.c +--- linux-2.6.34.orig/fs/reiser4/fsdata.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/fsdata.c 2010-05-27 02:44:03.707669526 +0200 @@ -0,0 +1,804 @@ +/* Copyright 2001, 2002, 2003, 2004, 2005 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -16477,9 +16311,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/fsdata.c linux-2.6.33/fs/reiser4/fsdata.c + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/fsdata.h linux-2.6.33/fs/reiser4/fsdata.h ---- linux-2.6.33.orig/fs/reiser4/fsdata.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/fsdata.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/fsdata.h linux-2.6.34/fs/reiser4/fsdata.h +--- linux-2.6.34.orig/fs/reiser4/fsdata.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/fsdata.h 2010-05-27 02:44:03.707669526 +0200 @@ -0,0 +1,205 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -16686,9 +16520,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/fsdata.h linux-2.6.33/fs/reiser4/fsdata.h + * fill-column: 120 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/init_super.c linux-2.6.33/fs/reiser4/init_super.c ---- linux-2.6.33.orig/fs/reiser4/init_super.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/init_super.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/init_super.c linux-2.6.34/fs/reiser4/init_super.c +--- linux-2.6.34.orig/fs/reiser4/init_super.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/init_super.c 2010-05-27 02:44:03.708899225 +0200 @@ -0,0 +1,761 @@ +/* Copyright by Hans Reiser, 2003 */ + @@ -17451,9 +17285,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/init_super.c linux-2.6.33/fs/reiser4/init + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/inode.c linux-2.6.33/fs/reiser4/inode.c ---- linux-2.6.33.orig/fs/reiser4/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/inode.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/inode.c linux-2.6.34/fs/reiser4/inode.c +--- linux-2.6.34.orig/fs/reiser4/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/inode.c 2010-05-27 02:44:03.709524829 +0200 @@ -0,0 +1,711 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -18166,9 +18000,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/inode.c linux-2.6.33/fs/reiser4/inode.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/inode.h linux-2.6.33/fs/reiser4/inode.h ---- linux-2.6.33.orig/fs/reiser4/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/inode.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/inode.h linux-2.6.34/fs/reiser4/inode.h +--- linux-2.6.34.orig/fs/reiser4/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/inode.h 2010-05-27 02:44:03.709524829 +0200 @@ -0,0 +1,453 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -18623,9 +18457,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/inode.h linux-2.6.33/fs/reiser4/inode.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/ioctl.h linux-2.6.33/fs/reiser4/ioctl.h ---- linux-2.6.33.orig/fs/reiser4/ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/ioctl.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/ioctl.h linux-2.6.34/fs/reiser4/ioctl.h +--- linux-2.6.34.orig/fs/reiser4/ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/ioctl.h 2010-05-27 02:44:03.709524829 +0200 @@ -0,0 +1,41 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -18668,9 +18502,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/ioctl.h linux-2.6.33/fs/reiser4/ioctl.h + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/jnode.c linux-2.6.33/fs/reiser4/jnode.c ---- linux-2.6.33.orig/fs/reiser4/jnode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/jnode.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/jnode.c linux-2.6.34/fs/reiser4/jnode.c +--- linux-2.6.34.orig/fs/reiser4/jnode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/jnode.c 2010-05-27 02:44:03.711648612 +0200 @@ -0,0 +1,1923 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -20595,9 +20429,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/jnode.c linux-2.6.33/fs/reiser4/jnode.c + fill-column: 80 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/jnode.h linux-2.6.33/fs/reiser4/jnode.h ---- linux-2.6.33.orig/fs/reiser4/jnode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/jnode.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/jnode.h linux-2.6.34/fs/reiser4/jnode.h +--- linux-2.6.34.orig/fs/reiser4/jnode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/jnode.h 2010-05-27 02:44:03.711648612 +0200 @@ -0,0 +1,704 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -21303,9 +21137,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/jnode.h linux-2.6.33/fs/reiser4/jnode.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/kassign.c linux-2.6.33/fs/reiser4/kassign.c ---- linux-2.6.33.orig/fs/reiser4/kassign.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/kassign.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/kassign.c linux-2.6.34/fs/reiser4/kassign.c +--- linux-2.6.34.orig/fs/reiser4/kassign.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/kassign.c 2010-05-27 02:44:03.712648654 +0200 @@ -0,0 +1,677 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -21984,9 +21818,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/kassign.c linux-2.6.33/fs/reiser4/kassign + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/kassign.h linux-2.6.33/fs/reiser4/kassign.h ---- linux-2.6.33.orig/fs/reiser4/kassign.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/kassign.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/kassign.h linux-2.6.34/fs/reiser4/kassign.h +--- linux-2.6.34.orig/fs/reiser4/kassign.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/kassign.h 2010-05-27 02:44:03.712648654 +0200 @@ -0,0 +1,111 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -22099,9 +21933,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/kassign.h linux-2.6.33/fs/reiser4/kassign + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/Kconfig linux-2.6.33/fs/reiser4/Kconfig ---- linux-2.6.33.orig/fs/reiser4/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/Kconfig 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/Kconfig linux-2.6.34/fs/reiser4/Kconfig +--- linux-2.6.34.orig/fs/reiser4/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/Kconfig 2010-05-27 02:44:03.713648833 +0200 @@ -0,0 +1,34 @@ +config REISER4_FS + tristate "Reiser4 (EXPERIMENTAL)" @@ -22137,9 +21971,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/Kconfig linux-2.6.33/fs/reiser4/Kconfig + Don't use this unless you are debugging reiser4. + + If unsure, say N. -diff -urN linux-2.6.33.orig/fs/reiser4/key.c linux-2.6.33/fs/reiser4/key.c ---- linux-2.6.33.orig/fs/reiser4/key.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/key.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/key.c linux-2.6.34/fs/reiser4/key.c +--- linux-2.6.34.orig/fs/reiser4/key.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/key.c 2010-05-27 02:44:03.713648833 +0200 @@ -0,0 +1,138 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -22279,9 +22113,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/key.c linux-2.6.33/fs/reiser4/key.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/key.h linux-2.6.33/fs/reiser4/key.h ---- linux-2.6.33.orig/fs/reiser4/key.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/key.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/key.h linux-2.6.34/fs/reiser4/key.h +--- linux-2.6.34.orig/fs/reiser4/key.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/key.h 2010-05-27 02:44:03.714648662 +0200 @@ -0,0 +1,392 @@ +/* Copyright 2000, 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -22675,9 +22509,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/key.h linux-2.6.33/fs/reiser4/key.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/ktxnmgrd.c linux-2.6.33/fs/reiser4/ktxnmgrd.c ---- linux-2.6.33.orig/fs/reiser4/ktxnmgrd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/ktxnmgrd.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/ktxnmgrd.c linux-2.6.34/fs/reiser4/ktxnmgrd.c +--- linux-2.6.34.orig/fs/reiser4/ktxnmgrd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/ktxnmgrd.c 2010-05-27 02:44:03.714648662 +0200 @@ -0,0 +1,215 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* Transaction manager daemon. */ @@ -22894,9 +22728,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/ktxnmgrd.c linux-2.6.33/fs/reiser4/ktxnmg + * fill-column: 120 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/ktxnmgrd.h linux-2.6.33/fs/reiser4/ktxnmgrd.h ---- linux-2.6.33.orig/fs/reiser4/ktxnmgrd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/ktxnmgrd.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/ktxnmgrd.h linux-2.6.34/fs/reiser4/ktxnmgrd.h +--- linux-2.6.34.orig/fs/reiser4/ktxnmgrd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/ktxnmgrd.h 2010-05-27 02:44:03.714648662 +0200 @@ -0,0 +1,52 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -22950,9 +22784,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/ktxnmgrd.h linux-2.6.33/fs/reiser4/ktxnmg + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/lock.c linux-2.6.33/fs/reiser4/lock.c ---- linux-2.6.33.orig/fs/reiser4/lock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/lock.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/lock.c linux-2.6.34/fs/reiser4/lock.c +--- linux-2.6.34.orig/fs/reiser4/lock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/lock.c 2010-05-27 02:44:03.715648699 +0200 @@ -0,0 +1,1237 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -24191,9 +24025,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/lock.c linux-2.6.33/fs/reiser4/lock.c + fill-column: 79 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/lock.h linux-2.6.33/fs/reiser4/lock.h ---- linux-2.6.33.orig/fs/reiser4/lock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/lock.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/lock.h linux-2.6.34/fs/reiser4/lock.h +--- linux-2.6.34.orig/fs/reiser4/lock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/lock.h 2010-05-27 02:44:03.716648804 +0200 @@ -0,0 +1,250 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -24445,9 +24279,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/lock.h linux-2.6.33/fs/reiser4/lock.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/Makefile linux-2.6.33/fs/reiser4/Makefile ---- linux-2.6.33.orig/fs/reiser4/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/Makefile linux-2.6.34/fs/reiser4/Makefile +--- linux-2.6.34.orig/fs/reiser4/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/Makefile 2010-05-27 02:44:03.716648804 +0200 @@ -0,0 +1,98 @@ +# +# reiser4/Makefile @@ -24547,9 +24381,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/Makefile linux-2.6.33/fs/reiser4/Makefile + plugin/disk_format/disk_format40.o \ + plugin/disk_format/disk_format.o + -diff -urN linux-2.6.33.orig/fs/reiser4/oid.c linux-2.6.33/fs/reiser4/oid.c ---- linux-2.6.33.orig/fs/reiser4/oid.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/oid.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/oid.c linux-2.6.34/fs/reiser4/oid.c +--- linux-2.6.34.orig/fs/reiser4/oid.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/oid.c 2010-05-27 02:44:03.716648804 +0200 @@ -0,0 +1,141 @@ +/* Copyright 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -24692,9 +24526,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/oid.c linux-2.6.33/fs/reiser4/oid.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/page_cache.c linux-2.6.33/fs/reiser4/page_cache.c ---- linux-2.6.33.orig/fs/reiser4/page_cache.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/page_cache.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/page_cache.c linux-2.6.34/fs/reiser4/page_cache.c +--- linux-2.6.34.orig/fs/reiser4/page_cache.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/page_cache.c 2010-05-27 02:44:03.717648560 +0200 @@ -0,0 +1,693 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -25389,9 +25223,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/page_cache.c linux-2.6.33/fs/reiser4/page + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/page_cache.h linux-2.6.33/fs/reiser4/page_cache.h ---- linux-2.6.33.orig/fs/reiser4/page_cache.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/page_cache.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/page_cache.h linux-2.6.34/fs/reiser4/page_cache.h +--- linux-2.6.34.orig/fs/reiser4/page_cache.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/page_cache.h 2010-05-27 02:44:03.717648560 +0200 @@ -0,0 +1,66 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -25459,9 +25293,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/page_cache.h linux-2.6.33/fs/reiser4/page + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/cluster.c linux-2.6.33/fs/reiser4/plugin/cluster.c ---- linux-2.6.33.orig/fs/reiser4/plugin/cluster.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/cluster.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/cluster.c linux-2.6.34/fs/reiser4/plugin/cluster.c +--- linux-2.6.34.orig/fs/reiser4/plugin/cluster.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/cluster.c 2010-05-27 02:44:03.718649112 +0200 @@ -0,0 +1,72 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -25535,9 +25369,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/cluster.c linux-2.6.33/fs/reiser4/ + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/cluster.h linux-2.6.33/fs/reiser4/plugin/cluster.h ---- linux-2.6.33.orig/fs/reiser4/plugin/cluster.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/cluster.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/cluster.h linux-2.6.34/fs/reiser4/plugin/cluster.h +--- linux-2.6.34.orig/fs/reiser4/plugin/cluster.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/cluster.h 2010-05-27 02:44:03.718649112 +0200 @@ -0,0 +1,410 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -25949,9 +25783,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/cluster.h linux-2.6.33/fs/reiser4/ + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/compress.c linux-2.6.33/fs/reiser4/plugin/compress/compress.c ---- linux-2.6.33.orig/fs/reiser4/plugin/compress/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/compress/compress.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/compress/compress.c linux-2.6.34/fs/reiser4/plugin/compress/compress.c +--- linux-2.6.34.orig/fs/reiser4/plugin/compress/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/compress/compress.c 2010-05-27 02:44:03.719648756 +0200 @@ -0,0 +1,355 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* reiser4 compression transform plugins */ @@ -26308,9 +26142,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/compress.c linux-2.6.33/f + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/compress.h linux-2.6.33/fs/reiser4/plugin/compress/compress.h ---- linux-2.6.33.orig/fs/reiser4/plugin/compress/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/compress/compress.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/compress/compress.h linux-2.6.34/fs/reiser4/plugin/compress/compress.h +--- linux-2.6.34.orig/fs/reiser4/plugin/compress/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/compress/compress.h 2010-05-27 02:44:03.719648756 +0200 @@ -0,0 +1,43 @@ +#if !defined( __FS_REISER4_COMPRESS_H__ ) +#define __FS_REISER4_COMPRESS_H__ @@ -26355,9 +26189,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/compress.h linux-2.6.33/f + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/compress_mode.c linux-2.6.33/fs/reiser4/plugin/compress/compress_mode.c ---- linux-2.6.33.orig/fs/reiser4/plugin/compress/compress_mode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/compress/compress_mode.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/compress/compress_mode.c linux-2.6.34/fs/reiser4/plugin/compress/compress_mode.c +--- linux-2.6.34.orig/fs/reiser4/plugin/compress/compress_mode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/compress/compress_mode.c 2010-05-27 02:44:03.720648536 +0200 @@ -0,0 +1,162 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* This file contains Reiser4 compression mode plugins. @@ -26521,18 +26355,18 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/compress_mode.c linux-2.6 + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/compress/Makefile linux-2.6.33/fs/reiser4/plugin/compress/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/compress/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/compress/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/compress/Makefile linux-2.6.34/fs/reiser4/plugin/compress/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/compress/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/compress/Makefile 2010-05-27 02:44:03.720648536 +0200 @@ -0,0 +1,5 @@ +obj-$(CONFIG_REISER4_FS) += compress_plugins.o + +compress_plugins-objs := \ + compress.o \ + compress_mode.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/crypto/cipher.c linux-2.6.33/fs/reiser4/plugin/crypto/cipher.c ---- linux-2.6.33.orig/fs/reiser4/plugin/crypto/cipher.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/crypto/cipher.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/crypto/cipher.c linux-2.6.34/fs/reiser4/plugin/crypto/cipher.c +--- linux-2.6.34.orig/fs/reiser4/plugin/crypto/cipher.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/crypto/cipher.c 2010-05-27 02:44:03.720648536 +0200 @@ -0,0 +1,37 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, + licensing governed by reiser4/README */ @@ -26571,9 +26405,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/crypto/cipher.c linux-2.6.33/fs/re + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/crypto/cipher.h linux-2.6.33/fs/reiser4/plugin/crypto/cipher.h ---- linux-2.6.33.orig/fs/reiser4/plugin/crypto/cipher.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/crypto/cipher.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/crypto/cipher.h linux-2.6.34/fs/reiser4/plugin/crypto/cipher.h +--- linux-2.6.34.orig/fs/reiser4/plugin/crypto/cipher.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/crypto/cipher.h 2010-05-27 02:44:03.721648592 +0200 @@ -0,0 +1,55 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* This file contains definitions for the objects operated @@ -26630,9 +26464,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/crypto/cipher.h linux-2.6.33/fs/re + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/crypto/digest.c linux-2.6.33/fs/reiser4/plugin/crypto/digest.c ---- linux-2.6.33.orig/fs/reiser4/plugin/crypto/digest.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/crypto/digest.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/crypto/digest.c linux-2.6.34/fs/reiser4/plugin/crypto/digest.c +--- linux-2.6.34.orig/fs/reiser4/plugin/crypto/digest.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/crypto/digest.c 2010-05-27 02:44:03.721648592 +0200 @@ -0,0 +1,58 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -26692,9 +26526,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/crypto/digest.c linux-2.6.33/fs/re + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/dir.h linux-2.6.33/fs/reiser4/plugin/dir/dir.h ---- linux-2.6.33.orig/fs/reiser4/plugin/dir/dir.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/dir/dir.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/dir/dir.h linux-2.6.34/fs/reiser4/plugin/dir/dir.h +--- linux-2.6.34.orig/fs/reiser4/plugin/dir/dir.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/dir/dir.h 2010-05-27 02:44:03.721648592 +0200 @@ -0,0 +1,36 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -26732,9 +26566,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/dir.h linux-2.6.33/fs/reiser4/ + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/hashed_dir.c linux-2.6.33/fs/reiser4/plugin/dir/hashed_dir.c ---- linux-2.6.33.orig/fs/reiser4/plugin/dir/hashed_dir.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/dir/hashed_dir.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/dir/hashed_dir.c linux-2.6.34/fs/reiser4/plugin/dir/hashed_dir.c +--- linux-2.6.34.orig/fs/reiser4/plugin/dir/hashed_dir.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/dir/hashed_dir.c 2010-05-27 02:44:03.722648715 +0200 @@ -0,0 +1,81 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -26817,18 +26651,18 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/hashed_dir.c linux-2.6.33/fs/r + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/Makefile linux-2.6.33/fs/reiser4/plugin/dir/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/dir/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/dir/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/dir/Makefile linux-2.6.34/fs/reiser4/plugin/dir/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/dir/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/dir/Makefile 2010-05-27 02:44:03.722648715 +0200 @@ -0,0 +1,5 @@ +obj-$(CONFIG_REISER4_FS) += dir_plugins.o + +dir_plugins-objs := \ + hashed_dir.o \ + seekable_dir.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/seekable_dir.c linux-2.6.33/fs/reiser4/plugin/dir/seekable_dir.c ---- linux-2.6.33.orig/fs/reiser4/plugin/dir/seekable_dir.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/dir/seekable_dir.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/dir/seekable_dir.c linux-2.6.34/fs/reiser4/plugin/dir/seekable_dir.c +--- linux-2.6.34.orig/fs/reiser4/plugin/dir/seekable_dir.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/dir/seekable_dir.c 2010-05-27 02:44:03.723648554 +0200 @@ -0,0 +1,46 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -26876,9 +26710,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir/seekable_dir.c linux-2.6.33/fs + set_key_offset(result, (__u64) 0); + return; +} -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir_plugin_common.c linux-2.6.33/fs/reiser4/plugin/dir_plugin_common.c ---- linux-2.6.33.orig/fs/reiser4/plugin/dir_plugin_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/dir_plugin_common.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/dir_plugin_common.c linux-2.6.34/fs/reiser4/plugin/dir_plugin_common.c +--- linux-2.6.34.orig/fs/reiser4/plugin/dir_plugin_common.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/dir_plugin_common.c 2010-05-27 02:44:03.723648554 +0200 @@ -0,0 +1,865 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + reiser4/README */ @@ -27745,9 +27579,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/dir_plugin_common.c linux-2.6.33/f + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format40.c linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format40.c ---- linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format40.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format40.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format40.c linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format40.c +--- linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format40.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format40.c 2010-05-27 02:44:03.724648949 +0200 @@ -0,0 +1,655 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -28404,9 +28238,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format40.c linux- + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format40.h linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format40.h ---- linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format40.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format40.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format40.h linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format40.h +--- linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format40.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format40.h 2010-05-27 02:44:03.725648853 +0200 @@ -0,0 +1,109 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -28517,9 +28351,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format40.h linux- + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format.c linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format.c ---- linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format.c linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format.c +--- linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format.c 2010-05-27 02:44:03.725648853 +0200 @@ -0,0 +1,38 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -28559,9 +28393,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format.c linux-2. + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format.h linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format.h ---- linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/disk_format/disk_format.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format.h linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format.h +--- linux-2.6.34.orig/fs/reiser4/plugin/disk_format/disk_format.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/disk_format/disk_format.h 2010-05-27 02:44:03.725648853 +0200 @@ -0,0 +1,27 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -28590,18 +28424,18 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/disk_format.h linux-2. + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/disk_format/Makefile linux-2.6.33/fs/reiser4/plugin/disk_format/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/disk_format/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/disk_format/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/disk_format/Makefile linux-2.6.34/fs/reiser4/plugin/disk_format/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/disk_format/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/disk_format/Makefile 2010-05-27 02:44:03.726648684 +0200 @@ -0,0 +1,5 @@ +obj-$(CONFIG_REISER4_FS) += df_plugins.o + +df_plugins-objs := \ + disk_format40.o \ + disk_format.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/fibration.c linux-2.6.33/fs/reiser4/plugin/fibration.c ---- linux-2.6.33.orig/fs/reiser4/plugin/fibration.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/fibration.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/fibration.c linux-2.6.34/fs/reiser4/plugin/fibration.c +--- linux-2.6.34.orig/fs/reiser4/plugin/fibration.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/fibration.c 2010-05-27 02:44:03.726648684 +0200 @@ -0,0 +1,175 @@ +/* Copyright 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -28778,9 +28612,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/fibration.c linux-2.6.33/fs/reiser + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/fibration.h linux-2.6.33/fs/reiser4/plugin/fibration.h ---- linux-2.6.33.orig/fs/reiser4/plugin/fibration.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/fibration.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/fibration.h linux-2.6.34/fs/reiser4/plugin/fibration.h +--- linux-2.6.34.orig/fs/reiser4/plugin/fibration.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/fibration.h 2010-05-27 02:44:03.726648684 +0200 @@ -0,0 +1,37 @@ +/* Copyright 2004 by Hans Reiser, licensing governed by reiser4/README */ + @@ -28819,9 +28653,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/fibration.h linux-2.6.33/fs/reiser + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/cryptcompress.c linux-2.6.33/fs/reiser4/plugin/file/cryptcompress.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file/cryptcompress.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/cryptcompress.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/cryptcompress.c linux-2.6.34/fs/reiser4/plugin/file/cryptcompress.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file/cryptcompress.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/cryptcompress.c 2010-05-27 02:44:03.729650467 +0200 @@ -0,0 +1,3803 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + reiser4/README */ @@ -32626,9 +32460,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/cryptcompress.c linux-2.6.33/ + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/cryptcompress.h linux-2.6.33/fs/reiser4/plugin/file/cryptcompress.h ---- linux-2.6.33.orig/fs/reiser4/plugin/file/cryptcompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/cryptcompress.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/cryptcompress.h linux-2.6.34/fs/reiser4/plugin/file/cryptcompress.h +--- linux-2.6.34.orig/fs/reiser4/plugin/file/cryptcompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/cryptcompress.h 2010-05-27 02:44:03.730527712 +0200 @@ -0,0 +1,616 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* See http://www.namesys.com/cryptcompress_design.html */ @@ -33246,9 +33080,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/cryptcompress.h linux-2.6.33/ + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/file.c linux-2.6.33/fs/reiser4/plugin/file/file.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file/file.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/file.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/file.c linux-2.6.34/fs/reiser4/plugin/file/file.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file/file.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/file.c 2010-05-27 02:44:03.731648641 +0200 @@ -0,0 +1,2688 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -35938,9 +35772,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/file.c linux-2.6.33/fs/reiser + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/file_conversion.c linux-2.6.33/fs/reiser4/plugin/file/file_conversion.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file/file_conversion.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/file_conversion.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/file_conversion.c linux-2.6.34/fs/reiser4/plugin/file/file_conversion.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file/file_conversion.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/file_conversion.c 2010-05-27 02:44:03.732648597 +0200 @@ -0,0 +1,747 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, + licensing governed by reiser4/README */ @@ -36689,9 +36523,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/file_conversion.c linux-2.6.3 + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/file.h linux-2.6.33/fs/reiser4/plugin/file/file.h ---- linux-2.6.33.orig/fs/reiser4/plugin/file/file.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/file.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/file.h linux-2.6.34/fs/reiser4/plugin/file/file.h +--- linux-2.6.34.orig/fs/reiser4/plugin/file/file.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/file.h 2010-05-27 02:44:03.733648552 +0200 @@ -0,0 +1,336 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -37029,9 +36863,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/file.h linux-2.6.33/fs/reiser + * scroll-step: 1 + * End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/Makefile linux-2.6.33/fs/reiser4/plugin/file/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/file/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/Makefile linux-2.6.34/fs/reiser4/plugin/file/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/file/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/Makefile 2010-05-27 02:44:03.733648552 +0200 @@ -0,0 +1,7 @@ +obj-$(CONFIG_REISER4_FS) += file_plugins.o + @@ -37040,9 +36874,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/Makefile linux-2.6.33/fs/reis + tail_conversion.o \ + symlink.o \ + cryptcompress.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/symfile.c linux-2.6.33/fs/reiser4/plugin/file/symfile.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file/symfile.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/symfile.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/symfile.c linux-2.6.34/fs/reiser4/plugin/file/symfile.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file/symfile.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/symfile.c 2010-05-27 02:44:03.733648552 +0200 @@ -0,0 +1,87 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -37131,9 +36965,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/symfile.c linux-2.6.33/fs/rei + sophisticated symfile syntax that we are not planning to write for + version 4.0. +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/symlink.c linux-2.6.33/fs/reiser4/plugin/file/symlink.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file/symlink.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/symlink.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/symlink.c linux-2.6.34/fs/reiser4/plugin/file/symlink.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file/symlink.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/symlink.c 2010-05-27 02:44:03.734648645 +0200 @@ -0,0 +1,95 @@ +/* Copyright 2002, 2003, 2005 by Hans Reiser, licensing governed by reiser4/README */ + @@ -37230,9 +37064,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/symlink.c linux-2.6.33/fs/rei + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/tail_conversion.c linux-2.6.33/fs/reiser4/plugin/file/tail_conversion.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file/tail_conversion.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file/tail_conversion.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file/tail_conversion.c linux-2.6.34/fs/reiser4/plugin/file/tail_conversion.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file/tail_conversion.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file/tail_conversion.c 2010-05-27 02:44:03.734648645 +0200 @@ -0,0 +1,743 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -37977,9 +37811,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file/tail_conversion.c linux-2.6.3 + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_ops.c linux-2.6.33/fs/reiser4/plugin/file_ops.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file_ops.c linux-2.6.34/fs/reiser4/plugin/file_ops.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file_ops.c 2010-05-27 02:44:03.735648598 +0200 @@ -0,0 +1,162 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + reiser4/README */ @@ -38143,9 +37977,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_ops.c linux-2.6.33/fs/reiser4 + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_ops_readdir.c linux-2.6.33/fs/reiser4/plugin/file_ops_readdir.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file_ops_readdir.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file_ops_readdir.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file_ops_readdir.c linux-2.6.34/fs/reiser4/plugin/file_ops_readdir.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file_ops_readdir.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file_ops_readdir.c 2010-05-27 02:44:03.735648598 +0200 @@ -0,0 +1,658 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -38805,9 +38639,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_ops_readdir.c linux-2.6.33/fs + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_plugin_common.c linux-2.6.33/fs/reiser4/plugin/file_plugin_common.c ---- linux-2.6.33.orig/fs/reiser4/plugin/file_plugin_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/file_plugin_common.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/file_plugin_common.c linux-2.6.34/fs/reiser4/plugin/file_plugin_common.c +--- linux-2.6.34.orig/fs/reiser4/plugin/file_plugin_common.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/file_plugin_common.c 2010-05-27 02:44:03.736648757 +0200 @@ -0,0 +1,1008 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + reiser4/README */ @@ -39755,8 +39589,8 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_plugin_common.c linux-2.6.33/ + if (!reiser4_inode_get_flag(inode, REISER4_NO_SD)) { + reiser4_key sd_key; + -+ vfs_dq_free_inode(inode); -+ vfs_dq_drop(inode); ++ dquot_free_inode(inode); ++ dquot_drop(inode); + + build_sd_key(inode, &sd_key); + result = @@ -39817,9 +39651,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/file_plugin_common.c linux-2.6.33/ + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/hash.c linux-2.6.33/fs/reiser4/plugin/hash.c ---- linux-2.6.33.orig/fs/reiser4/plugin/hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/hash.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/hash.c linux-2.6.34/fs/reiser4/plugin/hash.c +--- linux-2.6.34.orig/fs/reiser4/plugin/hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/hash.c 2010-05-27 02:44:03.737648706 +0200 @@ -0,0 +1,352 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -40173,9 +40007,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/hash.c linux-2.6.33/fs/reiser4/plu + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser4/plugin/inode_ops.c ---- linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/inode_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.34/fs/reiser4/plugin/inode_ops.c +--- linux-2.6.34.orig/fs/reiser4/plugin/inode_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/inode_ops.c 2010-05-27 02:44:03.738648810 +0200 @@ -0,0 +1,906 @@ +/* + * Copyright 2005 by Hans Reiser, licensing governed by reiser4/README @@ -40632,7 +40466,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + if ((attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) + || (attr->ia_valid & ATTR_GID + && attr->ia_gid != inode->i_gid)) { -+ result = vfs_dq_transfer(inode, attr) ? -EDQUOT : 0; ++ result = dquot_transfer(inode, attr) ? -EDQUOT : 0; + if (result) { + context_set_commit_async(ctx); + reiser4_exit_context(ctx); @@ -40772,8 +40606,8 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + /* So that on error iput will be called. */ + *retobj = object; + -+ if (vfs_dq_alloc_inode(object)) { -+ vfs_dq_drop(object); ++ if (dquot_alloc_inode(object)) { ++ dquot_drop(object); + object->i_flags |= S_NOQUOTA; + return RETERR(-EDQUOT); + } @@ -40787,7 +40621,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + if (result) { + warning("nikita-431", "Cannot install plugin %i on %llx", + data->id, (unsigned long long)get_inode_oid(object)); -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + return result; + } @@ -40796,7 +40630,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + obj_plug = inode_file_plugin(object); + + if (obj_plug->create_object == NULL) { -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + return RETERR(-EPERM); + } @@ -40815,7 +40649,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + warning("nikita-432", "Cannot inherit from %llx to %llx", + (unsigned long long)get_inode_oid(parent), + (unsigned long long)get_inode_oid(object)); -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + return result; + } @@ -40831,7 +40665,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + /* obtain directory plugin (if any) for new object. */ + obj_dir = inode_dir_plugin(object); + if (obj_dir != NULL && obj_dir->init == NULL) { -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + return RETERR(-EPERM); + } @@ -40840,7 +40674,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + + reserve = estimate_create_vfs_object(parent, object); + if (reiser4_grab_space(reserve, BA_CAN_COMMIT)) { -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + return RETERR(-ENOSPC); + } @@ -40871,7 +40705,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + warning("nikita-2219", + "Failed to create sd for %llu", + (unsigned long long)get_inode_oid(object)); -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + return result; + } @@ -40914,7 +40748,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + */ + reiser4_update_sd(object); + if (result != 0) { -+ vfs_dq_free_inode(object); ++ dquot_free_inode(object); + object->i_flags |= S_NOQUOTA; + /* if everything was ok (result == 0), parent stat-data is + * already updated above (update_parent_dir()) */ @@ -41083,9 +40917,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops.c linux-2.6.33/fs/reiser + dir->i_ctime = dir->i_mtime = CURRENT_TIME; + return reiser4_update_sd(dir); +} -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops_rename.c linux-2.6.33/fs/reiser4/plugin/inode_ops_rename.c ---- linux-2.6.33.orig/fs/reiser4/plugin/inode_ops_rename.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/inode_ops_rename.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/inode_ops_rename.c linux-2.6.34/fs/reiser4/plugin/inode_ops_rename.c +--- linux-2.6.34.orig/fs/reiser4/plugin/inode_ops_rename.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/inode_ops_rename.c 2010-05-27 02:44:03.739648702 +0200 @@ -0,0 +1,925 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -42012,9 +41846,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/inode_ops_rename.c linux-2.6.33/fs + return result; +} +#endif -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/acl.h linux-2.6.33/fs/reiser4/plugin/item/acl.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/acl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/acl.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/acl.h linux-2.6.34/fs/reiser4/plugin/item/acl.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/acl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/acl.h 2010-05-27 02:44:03.739648702 +0200 @@ -0,0 +1,66 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -42082,9 +41916,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/acl.h linux-2.6.33/fs/reiser4 + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/blackbox.c linux-2.6.33/fs/reiser4/plugin/item/blackbox.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/blackbox.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/blackbox.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/blackbox.c linux-2.6.34/fs/reiser4/plugin/item/blackbox.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/blackbox.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/blackbox.c 2010-05-27 02:44:03.739648702 +0200 @@ -0,0 +1,142 @@ +/* Copyright 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -42228,9 +42062,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/blackbox.c linux-2.6.33/fs/re + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/blackbox.h linux-2.6.33/fs/reiser4/plugin/item/blackbox.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/blackbox.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/blackbox.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/blackbox.h linux-2.6.34/fs/reiser4/plugin/item/blackbox.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/blackbox.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/blackbox.h 2010-05-27 02:44:03.740648590 +0200 @@ -0,0 +1,33 @@ +/* Copyright 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -42265,9 +42099,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/blackbox.h linux-2.6.33/fs/re + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/cde.c linux-2.6.33/fs/reiser4/plugin/item/cde.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/cde.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/cde.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/cde.c linux-2.6.34/fs/reiser4/plugin/item/cde.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/cde.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/cde.c 2010-05-27 02:44:03.741648545 +0200 @@ -0,0 +1,1008 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -43203,7 +43037,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/cde.c linux-2.6.33/fs/reiser4 + data.length = estimate_cde(result ? coord : NULL, &data); + + /* NOTE-NIKITA quota plugin? */ -+ if (vfs_dq_alloc_space_nodirty(dir, cde_bytes(result, &data))) ++ if (dquot_alloc_space_nodirty(dir, cde_bytes(result, &data))) + return RETERR(-EDQUOT); + + if (result) @@ -43254,7 +43088,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/cde.c linux-2.6.33/fs/reiser4 + kill_node_content(coord, &shadow, NULL, NULL, NULL, NULL, NULL, 0); + if (result == 0) { + /* NOTE-NIKITA quota plugin? */ -+ vfs_dq_free_space_nodirty(dir, length); ++ dquot_free_space_nodirty(dir, length); + } + return result; +} @@ -43277,9 +43111,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/cde.c linux-2.6.33/fs/reiser4 + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/cde.h linux-2.6.33/fs/reiser4/plugin/item/cde.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/cde.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/cde.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/cde.h linux-2.6.34/fs/reiser4/plugin/item/cde.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/cde.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/cde.h 2010-05-27 02:44:03.741648545 +0200 @@ -0,0 +1,87 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -43368,10 +43202,10 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/cde.h linux-2.6.33/fs/reiser4 + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.c linux-2.6.33/fs/reiser4/plugin/item/ctail.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/ctail.c 2010-03-04 19:33:22.000000000 +0100 -@@ -0,0 +1,1613 @@ +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/ctail.c linux-2.6.34/fs/reiser4/plugin/item/ctail.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/ctail.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/ctail.c 2010-05-27 11:35:21.466083297 +0200 +@@ -0,0 +1,1621 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + +/* ctails (aka "clustered tails") are items for cryptcompress objects */ @@ -44023,9 +43857,11 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.c linux-2.6.33/fs/reise + ret = ctail_read_disk_cluster(clust, inode, page, mode); + + assert("edward-212", PageLocked(page)); -+ if (ret) ++ if (ret) { ++ ClearPageUptodate(page); ++ SetPageError(page); + return ret; -+ ++ } + /* refresh bytes */ + to_page = pbytes(page_index(page), inode); + if (to_page == 0) { @@ -44043,7 +43879,13 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.c linux-2.6.33/fs/reise + + switch (clust->dstat) { + case UNPR_DISK_CLUSTER: -+ BUG_ON(1); ++ warning("edward-1563", ++ "orphan unprepped cluster %lu (inode %lli). Fsck?", ++ clust->index, ++ (unsigned long long)get_inode_oid(inode)); ++ ClearPageUptodate(page); ++ SetPageError(page); ++ return -EIO; + case TRNC_DISK_CLUSTER: + /* + * Race with truncate! @@ -44985,9 +44827,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.c linux-2.6.33/fs/reise + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.h linux-2.6.33/fs/reiser4/plugin/item/ctail.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/ctail.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/ctail.h linux-2.6.34/fs/reiser4/plugin/item/ctail.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/ctail.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/ctail.h 2010-05-27 02:44:03.742648635 +0200 @@ -0,0 +1,102 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -45091,9 +44933,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/ctail.h linux-2.6.33/fs/reise + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent.c linux-2.6.33/fs/reiser4/plugin/item/extent.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/extent.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/extent.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/extent.c linux-2.6.34/fs/reiser4/plugin/item/extent.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/extent.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/extent.c 2010-05-27 02:44:03.743648653 +0200 @@ -0,0 +1,197 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -45292,9 +45134,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent.c linux-2.6.33/fs/reis + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.33/fs/reiser4/plugin/item/extent_file_ops.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/extent_file_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/extent_file_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.34/fs/reiser4/plugin/item/extent_file_ops.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/extent_file_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/extent_file_ops.c 2010-05-27 02:44:03.744648529 +0200 @@ -0,0 +1,1453 @@ +/* COPYRIGHT 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -45558,8 +45400,8 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.3 + + assert("", get_key_offset(key) == (loff_t)index_jnode(jnodes[0]) * PAGE_CACHE_SIZE); + -+ result = vfs_dq_alloc_block_nodirty(mapping_jnode(jnodes[0])->host, -+ count); ++ result = dquot_alloc_block_nodirty(mapping_jnode(jnodes[0])->host, ++ count); + BUG_ON(result != 0); + + switch (state_of_extent(ext)) { @@ -45706,8 +45548,8 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.3 + if (count == 0) + return 0; + -+ result = vfs_dq_alloc_block_nodirty(mapping_jnode(jnodes[0])->host, -+ count); ++ result = dquot_alloc_block_nodirty(mapping_jnode(jnodes[0])->host, ++ count); + BUG_ON(result != 0); + + /* @@ -45921,8 +45763,8 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.3 + break; + + case HOLE_EXTENT: -+ result = vfs_dq_alloc_block_nodirty(mapping_jnode(node)->host, -+ 1); ++ result = dquot_alloc_block_nodirty(mapping_jnode(node)->host, ++ 1); + BUG_ON(result != 0); + result = plug_hole(uf_coord, key, &how); + if (result) @@ -46749,9 +46591,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.3 + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_flush_ops.c linux-2.6.33/fs/reiser4/plugin/item/extent_flush_ops.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/extent_flush_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/extent_flush_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/extent_flush_ops.c linux-2.6.34/fs/reiser4/plugin/item/extent_flush_ops.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/extent_flush_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/extent_flush_ops.c 2010-05-27 02:44:03.745648683 +0200 @@ -0,0 +1,1028 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -47781,9 +47623,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_flush_ops.c linux-2.6. + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent.h linux-2.6.33/fs/reiser4/plugin/item/extent.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/extent.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/extent.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/extent.h linux-2.6.34/fs/reiser4/plugin/item/extent.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/extent.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/extent.h 2010-05-27 02:44:03.745648683 +0200 @@ -0,0 +1,231 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -48016,9 +47858,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent.h linux-2.6.33/fs/reis + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_item_ops.c linux-2.6.33/fs/reiser4/plugin/item/extent_item_ops.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/extent_item_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/extent_item_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/extent_item_ops.c linux-2.6.34/fs/reiser4/plugin/item/extent_item_ops.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/extent_item_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/extent_item_ops.c 2010-05-27 02:44:03.746648765 +0200 @@ -0,0 +1,889 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -48490,7 +48332,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_item_ops.c linux-2.6.3 + length = to_off - offset; + } + -+ vfs_dq_free_block_nodirty(inode, length); ++ dquot_free_block_nodirty(inode, length); + + if (state_of_extent(ext) == UNALLOCATED_EXTENT) { + /* some jnodes corresponding to this unallocated extent */ @@ -48909,9 +48751,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/extent_item_ops.c linux-2.6.3 + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/internal.c linux-2.6.33/fs/reiser4/plugin/item/internal.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/internal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/internal.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/internal.c linux-2.6.34/fs/reiser4/plugin/item/internal.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/internal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/internal.c 2010-05-27 02:44:03.747648711 +0200 @@ -0,0 +1,404 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -49317,9 +49159,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/internal.c linux-2.6.33/fs/re + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/internal.h linux-2.6.33/fs/reiser4/plugin/item/internal.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/internal.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/internal.h linux-2.6.34/fs/reiser4/plugin/item/internal.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/internal.h 2010-05-27 02:44:03.747648711 +0200 @@ -0,0 +1,57 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* Internal item contains down-link to the child of the internal/twig @@ -49378,9 +49220,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/internal.h linux-2.6.33/fs/re + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/item.c linux-2.6.33/fs/reiser4/plugin/item/item.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/item.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/item.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/item.c linux-2.6.34/fs/reiser4/plugin/item/item.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/item.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/item.c 2010-05-27 02:44:03.748648586 +0200 @@ -0,0 +1,719 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -50101,9 +49943,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/item.c linux-2.6.33/fs/reiser + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/item.h linux-2.6.33/fs/reiser4/plugin/item/item.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/item.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/item.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/item.h linux-2.6.34/fs/reiser4/plugin/item/item.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/item.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/item.h 2010-05-27 02:44:03.748648586 +0200 @@ -0,0 +1,398 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -50503,9 +50345,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/item.h linux-2.6.33/fs/reiser + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/Makefile linux-2.6.33/fs/reiser4/plugin/item/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/item/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/Makefile linux-2.6.34/fs/reiser4/plugin/item/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/item/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/Makefile 2010-05-27 02:44:03.749648667 +0200 @@ -0,0 +1,18 @@ +obj-$(CONFIG_REISER4_FS) += item_plugins.o + @@ -50525,9 +50367,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/Makefile linux-2.6.33/fs/reis + + + -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/sde.c linux-2.6.33/fs/reiser4/plugin/item/sde.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/sde.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/sde.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/sde.c linux-2.6.34/fs/reiser4/plugin/item/sde.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/sde.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/sde.c 2010-05-27 02:44:03.749648667 +0200 @@ -0,0 +1,190 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -50651,7 +50493,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/sde.c linux-2.6.33/fs/reiser4 + data.iplug = item_plugin_by_id(SIMPLE_DIR_ENTRY_ID); + + /* NOTE-NIKITA quota plugin */ -+ if (vfs_dq_alloc_space_nodirty(dir, data.length)) ++ if (dquot_alloc_space_nodirty(dir, data.length)) + return -EDQUOT; + + result = insert_by_coord(coord, &data, &entry->key, lh, 0 /*flags */ ); @@ -50699,7 +50541,7 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/sde.c linux-2.6.33/fs/reiser4 + kill_node_content(coord, &shadow, NULL, NULL, NULL, NULL, NULL, 0); + if (result == 0) { + /* NOTE-NIKITA quota plugin */ -+ vfs_dq_free_space_nodirty(dir, length); ++ dquot_free_space_nodirty(dir, length); + } + return result; +} @@ -50719,9 +50561,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/sde.c linux-2.6.33/fs/reiser4 + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/sde.h linux-2.6.33/fs/reiser4/plugin/item/sde.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/sde.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/sde.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/sde.h linux-2.6.34/fs/reiser4/plugin/item/sde.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/sde.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/sde.h 2010-05-27 02:44:03.749648667 +0200 @@ -0,0 +1,66 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -50789,10 +50631,10 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/sde.h linux-2.6.33/fs/reiser4 + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.c linux-2.6.33/fs/reiser4/plugin/item/static_stat.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/static_stat.c 2010-03-04 19:33:22.000000000 +0100 -@@ -0,0 +1,1107 @@ +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/static_stat.c linux-2.6.34/fs/reiser4/plugin/item/static_stat.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/static_stat.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/static_stat.c 2010-05-27 02:44:03.750648605 +0200 +@@ -0,0 +1,1114 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + +/* stat data manipulation. */ @@ -50994,9 +50836,12 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.c linux-2.6.33/fs + + sdplug = sd_ext_plugin_by_id(bit); + assert("nikita-633", sdplug != NULL); -+ /* no aligment support -+ result += -+ round_up( result, sdplug -> alignment ) - result; */ ++ /* ++ no aligment support ++ result += ++ reiser4_round_up(result, sdplug -> alignment) - ++ result; ++ */ + result += sdplug->save_len(inode); + } + } @@ -51532,10 +51377,14 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.c linux-2.6.33/fs + info->heir_mask & (1 << memb)) { + len += sizeof(reiser4_plugin_slot); + if (plugin->h.pops && plugin->h.pops->save_len != NULL) { -+ /* non-standard plugin, call method */ -+ /* commented as it is incompatible with alignment -+ * policy in save_plug() -edward */ -+ /* len = round_up(len, plugin->h.pops->alignment); */ ++ /* ++ * non-standard plugin, call method ++ * commented as it is incompatible with alignment ++ * policy in save_plug() -edward ++ * ++ * len = reiser4_round_up(len, ++ * plugin->h.pops->alignment); ++ */ + len += plugin->h.pops->save_len(inode, plugin); + } + } @@ -51900,9 +51749,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.c linux-2.6.33/fs + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.h linux-2.6.33/fs/reiser4/plugin/item/static_stat.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/static_stat.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/static_stat.h linux-2.6.34/fs/reiser4/plugin/item/static_stat.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/static_stat.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/static_stat.h 2010-05-27 02:44:03.751648545 +0200 @@ -0,0 +1,224 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -52128,9 +51977,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/static_stat.h linux-2.6.33/fs + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.c linux-2.6.33/fs/reiser4/plugin/item/tail.c ---- linux-2.6.33.orig/fs/reiser4/plugin/item/tail.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/tail.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/tail.c linux-2.6.34/fs/reiser4/plugin/item/tail.c +--- linux-2.6.34.orig/fs/reiser4/plugin/item/tail.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/tail.c 2010-05-27 02:44:03.752648766 +0200 @@ -0,0 +1,807 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -52628,11 +52477,11 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.c linux-2.6.33/fs/reiser + * were real data which are all zeros. Therefore we have to + * allocate quota here as well + */ -+ if (vfs_dq_alloc_space_nodirty(inode, flow->length)) ++ if (dquot_alloc_space_nodirty(inode, flow->length)) + return RETERR(-EDQUOT); + result = reiser4_insert_flow(coord, lh, flow); + if (flow->length) -+ vfs_dq_free_space_nodirty(inode, flow->length); ++ dquot_free_space_nodirty(inode, flow->length); + + uf_info = unix_file_inode_data(inode); + @@ -52652,13 +52501,13 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.c linux-2.6.33/fs/reiser + } + + /* check quota before appending data */ -+ if (vfs_dq_alloc_space_nodirty(inode, flow->length)) ++ if (dquot_alloc_space_nodirty(inode, flow->length)) + return RETERR(-EDQUOT); + + to_write = flow->length; + result = reiser4_insert_flow(coord, lh, flow); + if (flow->length) -+ vfs_dq_free_space_nodirty(inode, flow->length); ++ dquot_free_space_nodirty(inode, flow->length); + return (to_write - flow->length) ? (to_write - flow->length) : result; +} + @@ -52687,22 +52536,22 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.c linux-2.6.33/fs/reiser + * were real data which are all zeros. Therefore we have to + * allocate quota here as well + */ -+ if (vfs_dq_alloc_space_nodirty(inode, flow->length)) ++ if (dquot_alloc_space_nodirty(inode, flow->length)) + return RETERR(-EDQUOT); + result = reiser4_insert_flow(coord, lh, flow); + if (flow->length) -+ vfs_dq_free_space_nodirty(inode, flow->length); ++ dquot_free_space_nodirty(inode, flow->length); + return result; + } + + /* check quota before appending data */ -+ if (vfs_dq_alloc_space_nodirty(inode, flow->length)) ++ if (dquot_alloc_space_nodirty(inode, flow->length)) + return RETERR(-EDQUOT); + + to_write = flow->length; + result = reiser4_insert_flow(coord, lh, flow); + if (flow->length) -+ vfs_dq_free_space_nodirty(inode, flow->length); ++ dquot_free_space_nodirty(inode, flow->length); + return (to_write - flow->length) ? (to_write - flow->length) : result; +} + @@ -52939,9 +52788,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.c linux-2.6.33/fs/reiser + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.h linux-2.6.33/fs/reiser4/plugin/item/tail.h ---- linux-2.6.33.orig/fs/reiser4/plugin/item/tail.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/item/tail.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/item/tail.h linux-2.6.34/fs/reiser4/plugin/item/tail.h +--- linux-2.6.34.orig/fs/reiser4/plugin/item/tail.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/item/tail.h 2010-05-27 02:44:03.752648766 +0200 @@ -0,0 +1,56 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -52999,9 +52848,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/item/tail.h linux-2.6.33/fs/reiser + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/Makefile linux-2.6.33/fs/reiser4/plugin/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/Makefile linux-2.6.34/fs/reiser4/plugin/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/Makefile 2010-05-27 02:44:03.752648766 +0200 @@ -0,0 +1,26 @@ +obj-$(CONFIG_REISER4_FS) += plugins.o + @@ -53029,18 +52878,18 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/Makefile linux-2.6.33/fs/reiser4/p +obj-$(CONFIG_REISER4_FS) += space/ +obj-$(CONFIG_REISER4_FS) += disk_format/ +obj-$(CONFIG_REISER4_FS) += security/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/Makefile linux-2.6.33/fs/reiser4/plugin/node/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/node/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/node/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/node/Makefile linux-2.6.34/fs/reiser4/plugin/node/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/node/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/node/Makefile 2010-05-27 02:44:03.753648631 +0200 @@ -0,0 +1,5 @@ +obj-$(CONFIG_REISER4_FS) += node_plugins.o + +node_plugins-objs := \ + node.o \ + node40.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node40.c linux-2.6.33/fs/reiser4/plugin/node/node40.c ---- linux-2.6.33.orig/fs/reiser4/plugin/node/node40.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/node/node40.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/node/node40.c linux-2.6.34/fs/reiser4/plugin/node/node40.c +--- linux-2.6.34.orig/fs/reiser4/plugin/node/node40.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/node/node40.c 2010-05-27 02:44:03.755648347 +0200 @@ -0,0 +1,2924 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -55966,9 +55815,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node40.c linux-2.6.33/fs/reis + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node40.h linux-2.6.33/fs/reiser4/plugin/node/node40.h ---- linux-2.6.33.orig/fs/reiser4/plugin/node/node40.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/node/node40.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/node/node40.h linux-2.6.34/fs/reiser4/plugin/node/node40.h +--- linux-2.6.34.orig/fs/reiser4/plugin/node/node40.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/node/node40.h 2010-05-27 02:44:03.755648347 +0200 @@ -0,0 +1,125 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -56095,9 +55944,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node40.h linux-2.6.33/fs/reis + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node.c linux-2.6.33/fs/reiser4/plugin/node/node.c ---- linux-2.6.33.orig/fs/reiser4/plugin/node/node.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/node/node.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/node/node.c linux-2.6.34/fs/reiser4/plugin/node/node.c +--- linux-2.6.34.orig/fs/reiser4/plugin/node/node.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/node/node.c 2010-05-27 02:44:03.756648694 +0200 @@ -0,0 +1,131 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -56230,9 +56079,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node.c linux-2.6.33/fs/reiser + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node.h linux-2.6.33/fs/reiser4/plugin/node/node.h ---- linux-2.6.33.orig/fs/reiser4/plugin/node/node.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/node/node.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/node/node.h linux-2.6.34/fs/reiser4/plugin/node/node.h +--- linux-2.6.34.orig/fs/reiser4/plugin/node/node.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/node/node.h 2010-05-27 02:44:03.756648694 +0200 @@ -0,0 +1,272 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -56506,9 +56355,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/node/node.h linux-2.6.33/fs/reiser + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/object.c linux-2.6.33/fs/reiser4/plugin/object.c ---- linux-2.6.33.orig/fs/reiser4/plugin/object.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/object.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/object.c linux-2.6.34/fs/reiser4/plugin/object.c +--- linux-2.6.34.orig/fs/reiser4/plugin/object.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/object.c 2010-05-27 02:44:03.757648553 +0200 @@ -0,0 +1,531 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -57041,9 +56890,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/object.c linux-2.6.33/fs/reiser4/p + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/object.h linux-2.6.33/fs/reiser4/plugin/object.h ---- linux-2.6.33.orig/fs/reiser4/plugin/object.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/object.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/object.h linux-2.6.34/fs/reiser4/plugin/object.h +--- linux-2.6.34.orig/fs/reiser4/plugin/object.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/object.h 2010-05-27 02:44:03.757648553 +0200 @@ -0,0 +1,117 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -57162,9 +57011,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/object.h linux-2.6.33/fs/reiser4/p + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin.c linux-2.6.33/fs/reiser4/plugin/plugin.c ---- linux-2.6.33.orig/fs/reiser4/plugin/plugin.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/plugin.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/plugin.c linux-2.6.34/fs/reiser4/plugin/plugin.c +--- linux-2.6.34.orig/fs/reiser4/plugin/plugin.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/plugin.c 2010-05-27 02:44:03.758648623 +0200 @@ -0,0 +1,560 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -57726,9 +57575,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin.c linux-2.6.33/fs/reiser4/p + * fill-column: 120 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin.h linux-2.6.33/fs/reiser4/plugin/plugin.h ---- linux-2.6.33.orig/fs/reiser4/plugin/plugin.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/plugin.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/plugin.h linux-2.6.34/fs/reiser4/plugin/plugin.h +--- linux-2.6.34.orig/fs/reiser4/plugin/plugin.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/plugin.h 2010-05-27 02:44:03.759648693 +0200 @@ -0,0 +1,942 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -58672,9 +58521,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin.h linux-2.6.33/fs/reiser4/p + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin_header.h linux-2.6.33/fs/reiser4/plugin/plugin_header.h ---- linux-2.6.33.orig/fs/reiser4/plugin/plugin_header.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/plugin_header.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/plugin_header.h linux-2.6.34/fs/reiser4/plugin/plugin_header.h +--- linux-2.6.34.orig/fs/reiser4/plugin/plugin_header.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/plugin_header.h 2010-05-27 02:44:03.759648693 +0200 @@ -0,0 +1,149 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -58825,9 +58674,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin_header.h linux-2.6.33/fs/re + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin_set.c linux-2.6.33/fs/reiser4/plugin/plugin_set.c ---- linux-2.6.33.orig/fs/reiser4/plugin/plugin_set.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/plugin_set.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/plugin_set.c linux-2.6.34/fs/reiser4/plugin/plugin_set.c +--- linux-2.6.34.orig/fs/reiser4/plugin/plugin_set.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/plugin_set.c 2010-05-27 02:44:03.760648623 +0200 @@ -0,0 +1,380 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -59209,9 +59058,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin_set.c linux-2.6.33/fs/reise + * fill-column: 120 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin_set.h linux-2.6.33/fs/reiser4/plugin/plugin_set.h ---- linux-2.6.33.orig/fs/reiser4/plugin/plugin_set.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/plugin_set.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/plugin_set.h linux-2.6.34/fs/reiser4/plugin/plugin_set.h +--- linux-2.6.34.orig/fs/reiser4/plugin/plugin_set.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/plugin_set.h 2010-05-27 02:44:03.760648623 +0200 @@ -0,0 +1,78 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -59291,17 +59140,17 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/plugin_set.h linux-2.6.33/fs/reise + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/security/Makefile linux-2.6.33/fs/reiser4/plugin/security/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/security/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/security/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/security/Makefile linux-2.6.34/fs/reiser4/plugin/security/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/security/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/security/Makefile 2010-05-27 02:44:03.760648623 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_REISER4_FS) += security_plugins.o + +security_plugins-objs := \ + perm.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/security/perm.c linux-2.6.33/fs/reiser4/plugin/security/perm.c ---- linux-2.6.33.orig/fs/reiser4/plugin/security/perm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/security/perm.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/security/perm.c linux-2.6.34/fs/reiser4/plugin/security/perm.c +--- linux-2.6.34.orig/fs/reiser4/plugin/security/perm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/security/perm.c 2010-05-27 02:44:03.761648693 +0200 @@ -0,0 +1,33 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -59336,9 +59185,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/security/perm.c linux-2.6.33/fs/re + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/security/perm.h linux-2.6.33/fs/reiser4/plugin/security/perm.h ---- linux-2.6.33.orig/fs/reiser4/plugin/security/perm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/security/perm.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/security/perm.h linux-2.6.34/fs/reiser4/plugin/security/perm.h +--- linux-2.6.34.orig/fs/reiser4/plugin/security/perm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/security/perm.h 2010-05-27 02:44:03.761648693 +0200 @@ -0,0 +1,38 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -59378,9 +59227,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/security/perm.h linux-2.6.33/fs/re + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/bitmap.c linux-2.6.33/fs/reiser4/plugin/space/bitmap.c ---- linux-2.6.33.orig/fs/reiser4/plugin/space/bitmap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/space/bitmap.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/space/bitmap.c linux-2.6.34/fs/reiser4/plugin/space/bitmap.c +--- linux-2.6.34.orig/fs/reiser4/plugin/space/bitmap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/space/bitmap.c 2010-05-27 02:44:03.762648623 +0200 @@ -0,0 +1,1585 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -60967,9 +60816,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/bitmap.c linux-2.6.33/fs/rei + * scroll-step: 1 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/bitmap.h linux-2.6.33/fs/reiser4/plugin/space/bitmap.h ---- linux-2.6.33.orig/fs/reiser4/plugin/space/bitmap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/space/bitmap.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/space/bitmap.h linux-2.6.34/fs/reiser4/plugin/space/bitmap.h +--- linux-2.6.34.orig/fs/reiser4/plugin/space/bitmap.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/space/bitmap.h 2010-05-27 02:44:03.763648693 +0200 @@ -0,0 +1,47 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -61018,17 +60867,17 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/bitmap.h linux-2.6.33/fs/rei + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/Makefile linux-2.6.33/fs/reiser4/plugin/space/Makefile ---- linux-2.6.33.orig/fs/reiser4/plugin/space/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/space/Makefile 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/space/Makefile linux-2.6.34/fs/reiser4/plugin/space/Makefile +--- linux-2.6.34.orig/fs/reiser4/plugin/space/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/space/Makefile 2010-05-27 02:44:03.763648693 +0200 @@ -0,0 +1,4 @@ +obj-$(CONFIG_REISER4_FS) += space_plugins.o + +space_plugins-objs := \ + bitmap.o -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/space_allocator.h linux-2.6.33/fs/reiser4/plugin/space/space_allocator.h ---- linux-2.6.33.orig/fs/reiser4/plugin/space/space_allocator.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/space/space_allocator.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/space/space_allocator.h linux-2.6.34/fs/reiser4/plugin/space/space_allocator.h +--- linux-2.6.34.orig/fs/reiser4/plugin/space/space_allocator.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/space/space_allocator.h 2010-05-27 02:44:03.763648693 +0200 @@ -0,0 +1,80 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -61110,9 +60959,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/space/space_allocator.h linux-2.6. + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/plugin/tail_policy.c linux-2.6.33/fs/reiser4/plugin/tail_policy.c ---- linux-2.6.33.orig/fs/reiser4/plugin/tail_policy.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/plugin/tail_policy.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/plugin/tail_policy.c linux-2.6.34/fs/reiser4/plugin/tail_policy.c +--- linux-2.6.34.orig/fs/reiser4/plugin/tail_policy.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/plugin/tail_policy.c 2010-05-27 02:44:03.764648483 +0200 @@ -0,0 +1,113 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -61227,9 +61076,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/plugin/tail_policy.c linux-2.6.33/fs/reis + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/pool.c linux-2.6.33/fs/reiser4/pool.c ---- linux-2.6.33.orig/fs/reiser4/pool.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/pool.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/pool.c linux-2.6.34/fs/reiser4/pool.c +--- linux-2.6.34.orig/fs/reiser4/pool.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/pool.c 2010-05-27 02:44:03.764648483 +0200 @@ -0,0 +1,231 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -61462,9 +61311,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/pool.c linux-2.6.33/fs/reiser4/pool.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/pool.h linux-2.6.33/fs/reiser4/pool.h ---- linux-2.6.33.orig/fs/reiser4/pool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/pool.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/pool.h linux-2.6.34/fs/reiser4/pool.h +--- linux-2.6.34.orig/fs/reiser4/pool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/pool.h 2010-05-27 02:44:03.764648483 +0200 @@ -0,0 +1,57 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -61523,9 +61372,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/pool.h linux-2.6.33/fs/reiser4/pool.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/readahead.c linux-2.6.33/fs/reiser4/readahead.c ---- linux-2.6.33.orig/fs/reiser4/readahead.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/readahead.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/readahead.c linux-2.6.34/fs/reiser4/readahead.c +--- linux-2.6.34.orig/fs/reiser4/readahead.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/readahead.c 2010-05-27 02:44:03.765648553 +0200 @@ -0,0 +1,140 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -61667,9 +61516,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/readahead.c linux-2.6.33/fs/reiser4/reada + fill-column: 80 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/readahead.h linux-2.6.33/fs/reiser4/readahead.h ---- linux-2.6.33.orig/fs/reiser4/readahead.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/readahead.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/readahead.h linux-2.6.34/fs/reiser4/readahead.h +--- linux-2.6.34.orig/fs/reiser4/readahead.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/readahead.h 2010-05-27 02:44:03.765648553 +0200 @@ -0,0 +1,52 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -61723,9 +61572,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/readahead.h linux-2.6.33/fs/reiser4/reada + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/README linux-2.6.33/fs/reiser4/README ---- linux-2.6.33.orig/fs/reiser4/README 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/README 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/README linux-2.6.34/fs/reiser4/README +--- linux-2.6.34.orig/fs/reiser4/README 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/README 2010-05-27 02:44:03.765648553 +0200 @@ -0,0 +1,128 @@ +[LICENSING] + @@ -61855,9 +61704,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/README linux-2.6.33/fs/reiser4/README +Edward Shishkin wrote cryptcompress file plugin (which manages files +built of encrypted and(or) compressed bodies) and other plugins related +to transparent encryption and compression support. -diff -urN linux-2.6.33.orig/fs/reiser4/reiser4.h linux-2.6.33/fs/reiser4/reiser4.h ---- linux-2.6.33.orig/fs/reiser4/reiser4.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/reiser4.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/reiser4.h linux-2.6.34/fs/reiser4/reiser4.h +--- linux-2.6.34.orig/fs/reiser4/reiser4.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/reiser4.h 2010-05-27 02:44:03.766648763 +0200 @@ -0,0 +1,259 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -62118,9 +61967,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/reiser4.h linux-2.6.33/fs/reiser4/reiser4 + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/safe_link.c linux-2.6.33/fs/reiser4/safe_link.c ---- linux-2.6.33.orig/fs/reiser4/safe_link.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/safe_link.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/safe_link.c linux-2.6.34/fs/reiser4/safe_link.c +--- linux-2.6.34.orig/fs/reiser4/safe_link.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/safe_link.c 2010-05-27 02:44:03.766648763 +0200 @@ -0,0 +1,354 @@ +/* Copyright 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -62476,9 +62325,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/safe_link.c linux-2.6.33/fs/reiser4/safe_ + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/safe_link.h linux-2.6.33/fs/reiser4/safe_link.h ---- linux-2.6.33.orig/fs/reiser4/safe_link.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/safe_link.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/safe_link.h linux-2.6.34/fs/reiser4/safe_link.h +--- linux-2.6.34.orig/fs/reiser4/safe_link.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/safe_link.h 2010-05-27 02:44:03.767648832 +0200 @@ -0,0 +1,29 @@ +/* Copyright 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -62509,9 +62358,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/safe_link.h linux-2.6.33/fs/reiser4/safe_ + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/seal.c linux-2.6.33/fs/reiser4/seal.c ---- linux-2.6.33.orig/fs/reiser4/seal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/seal.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/seal.c linux-2.6.34/fs/reiser4/seal.c +--- linux-2.6.34.orig/fs/reiser4/seal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/seal.c 2010-05-27 02:44:03.767648832 +0200 @@ -0,0 +1,218 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ +/* Seals implementation. */ @@ -62731,9 +62580,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/seal.c linux-2.6.33/fs/reiser4/seal.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/seal.h linux-2.6.33/fs/reiser4/seal.h ---- linux-2.6.33.orig/fs/reiser4/seal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/seal.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/seal.h linux-2.6.34/fs/reiser4/seal.h +--- linux-2.6.34.orig/fs/reiser4/seal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/seal.h 2010-05-27 02:44:03.767648832 +0200 @@ -0,0 +1,49 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -62784,9 +62633,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/seal.h linux-2.6.33/fs/reiser4/seal.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/search.c linux-2.6.33/fs/reiser4/search.c ---- linux-2.6.33.orig/fs/reiser4/search.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/search.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/search.c linux-2.6.34/fs/reiser4/search.c +--- linux-2.6.34.orig/fs/reiser4/search.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/search.c 2010-05-27 02:44:03.769649042 +0200 @@ -0,0 +1,1612 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -64400,9 +64249,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/search.c linux-2.6.33/fs/reiser4/search.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/status_flags.c linux-2.6.33/fs/reiser4/status_flags.c ---- linux-2.6.33.orig/fs/reiser4/status_flags.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/status_flags.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/status_flags.c linux-2.6.34/fs/reiser4/status_flags.c +--- linux-2.6.34.orig/fs/reiser4/status_flags.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/status_flags.c 2010-05-27 02:44:03.769649042 +0200 @@ -0,0 +1,174 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -64578,9 +64427,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/status_flags.c linux-2.6.33/fs/reiser4/st + get_super_private(sb)->status_bio = NULL; + return 0; +} -diff -urN linux-2.6.33.orig/fs/reiser4/status_flags.h linux-2.6.33/fs/reiser4/status_flags.h ---- linux-2.6.33.orig/fs/reiser4/status_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/status_flags.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/status_flags.h linux-2.6.34/fs/reiser4/status_flags.h +--- linux-2.6.34.orig/fs/reiser4/status_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/status_flags.h 2010-05-27 02:44:03.769649042 +0200 @@ -0,0 +1,47 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -64629,9 +64478,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/status_flags.h linux-2.6.33/fs/reiser4/st +int reiser4_status_finish(void); + +#endif -diff -urN linux-2.6.33.orig/fs/reiser4/super.c linux-2.6.33/fs/reiser4/super.c ---- linux-2.6.33.orig/fs/reiser4/super.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/super.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/super.c linux-2.6.34/fs/reiser4/super.c +--- linux-2.6.34.orig/fs/reiser4/super.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/super.c 2010-05-27 02:44:03.770648832 +0200 @@ -0,0 +1,306 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -64939,9 +64788,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/super.c linux-2.6.33/fs/reiser4/super.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/super.h linux-2.6.33/fs/reiser4/super.h ---- linux-2.6.33.orig/fs/reiser4/super.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/super.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/super.h linux-2.6.34/fs/reiser4/super.h +--- linux-2.6.34.orig/fs/reiser4/super.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/super.h 2010-05-27 02:44:03.770648832 +0200 @@ -0,0 +1,466 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -65409,9 +65258,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/super.h linux-2.6.33/fs/reiser4/super.h + * fill-column: 120 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/super_ops.c linux-2.6.33/fs/reiser4/super_ops.c ---- linux-2.6.33.orig/fs/reiser4/super_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/super_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/super_ops.c linux-2.6.34/fs/reiser4/super_ops.c +--- linux-2.6.34.orig/fs/reiser4/super_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/super_ops.c 2010-05-27 02:44:03.771648693 +0200 @@ -0,0 +1,736 @@ +/* Copyright 2005 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -66149,9 +65998,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/super_ops.c linux-2.6.33/fs/reiser4/super + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/tap.c linux-2.6.33/fs/reiser4/tap.c ---- linux-2.6.33.orig/fs/reiser4/tap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tap.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tap.c linux-2.6.34/fs/reiser4/tap.c +--- linux-2.6.34.orig/fs/reiser4/tap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tap.c 2010-05-27 02:44:03.771648693 +0200 @@ -0,0 +1,376 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -66529,9 +66378,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tap.c linux-2.6.33/fs/reiser4/tap.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tap.h linux-2.6.33/fs/reiser4/tap.h ---- linux-2.6.33.orig/fs/reiser4/tap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tap.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tap.h linux-2.6.34/fs/reiser4/tap.h +--- linux-2.6.34.orig/fs/reiser4/tap.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tap.h 2010-05-27 02:44:03.772648483 +0200 @@ -0,0 +1,70 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -66603,9 +66452,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tap.h linux-2.6.33/fs/reiser4/tap.h + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tree.c linux-2.6.33/fs/reiser4/tree.c ---- linux-2.6.33.orig/fs/reiser4/tree.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tree.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tree.c linux-2.6.34/fs/reiser4/tree.c +--- linux-2.6.34.orig/fs/reiser4/tree.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tree.c 2010-05-27 02:44:03.773648763 +0200 @@ -0,0 +1,1878 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -68485,9 +68334,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tree.c linux-2.6.33/fs/reiser4/tree.c + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tree.h linux-2.6.33/fs/reiser4/tree.h ---- linux-2.6.33.orig/fs/reiser4/tree.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tree.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tree.h linux-2.6.34/fs/reiser4/tree.h +--- linux-2.6.34.orig/fs/reiser4/tree.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tree.h 2010-05-27 02:44:03.774648553 +0200 @@ -0,0 +1,577 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -69066,9 +68915,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tree.h linux-2.6.33/fs/reiser4/tree.h + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tree_mod.c linux-2.6.33/fs/reiser4/tree_mod.c ---- linux-2.6.33.orig/fs/reiser4/tree_mod.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tree_mod.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tree_mod.c linux-2.6.34/fs/reiser4/tree_mod.c +--- linux-2.6.34.orig/fs/reiser4/tree_mod.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tree_mod.c 2010-05-27 02:44:03.774648553 +0200 @@ -0,0 +1,386 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -69456,9 +69305,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tree_mod.c linux-2.6.33/fs/reiser4/tree_m + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tree_mod.h linux-2.6.33/fs/reiser4/tree_mod.h ---- linux-2.6.33.orig/fs/reiser4/tree_mod.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tree_mod.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tree_mod.h linux-2.6.34/fs/reiser4/tree_mod.h +--- linux-2.6.34.orig/fs/reiser4/tree_mod.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tree_mod.h 2010-05-27 02:44:03.775648553 +0200 @@ -0,0 +1,29 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -69489,9 +69338,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tree_mod.h linux-2.6.33/fs/reiser4/tree_m + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tree_walk.c linux-2.6.33/fs/reiser4/tree_walk.c ---- linux-2.6.33.orig/fs/reiser4/tree_walk.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tree_walk.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tree_walk.c linux-2.6.34/fs/reiser4/tree_walk.c +--- linux-2.6.34.orig/fs/reiser4/tree_walk.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tree_walk.c 2010-05-27 02:44:03.776648693 +0200 @@ -0,0 +1,927 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -70420,9 +70269,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tree_walk.c linux-2.6.33/fs/reiser4/tree_ + fill-column: 80 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/tree_walk.h linux-2.6.33/fs/reiser4/tree_walk.h ---- linux-2.6.33.orig/fs/reiser4/tree_walk.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/tree_walk.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/tree_walk.h linux-2.6.34/fs/reiser4/tree_walk.h +--- linux-2.6.34.orig/fs/reiser4/tree_walk.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/tree_walk.h 2010-05-27 02:44:03.776648693 +0200 @@ -0,0 +1,125 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -70549,9 +70398,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/tree_walk.h linux-2.6.33/fs/reiser4/tree_ + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/txnmgr.c linux-2.6.33/fs/reiser4/txnmgr.c ---- linux-2.6.33.orig/fs/reiser4/txnmgr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/txnmgr.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/txnmgr.c linux-2.6.34/fs/reiser4/txnmgr.c +--- linux-2.6.34.orig/fs/reiser4/txnmgr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/txnmgr.c 2010-05-27 02:44:03.778648413 +0200 @@ -0,0 +1,3165 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -73718,9 +73567,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/txnmgr.c linux-2.6.33/fs/reiser4/txnmgr.c + * fill-column: 79 + * End: + */ -diff -urN linux-2.6.33.orig/fs/reiser4/txnmgr.h linux-2.6.33/fs/reiser4/txnmgr.h ---- linux-2.6.33.orig/fs/reiser4/txnmgr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/txnmgr.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/txnmgr.h linux-2.6.34/fs/reiser4/txnmgr.h +--- linux-2.6.34.orig/fs/reiser4/txnmgr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/txnmgr.h 2010-05-27 02:44:03.779648553 +0200 @@ -0,0 +1,701 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -74423,9 +74272,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/txnmgr.h linux-2.6.33/fs/reiser4/txnmgr.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/type_safe_hash.h linux-2.6.33/fs/reiser4/type_safe_hash.h ---- linux-2.6.33.orig/fs/reiser4/type_safe_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/type_safe_hash.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/type_safe_hash.h linux-2.6.34/fs/reiser4/type_safe_hash.h +--- linux-2.6.34.orig/fs/reiser4/type_safe_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/type_safe_hash.h 2010-05-27 02:44:03.779648553 +0200 @@ -0,0 +1,320 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -74747,9 +74596,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/type_safe_hash.h linux-2.6.33/fs/reiser4/ + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/vfs_ops.c linux-2.6.33/fs/reiser4/vfs_ops.c ---- linux-2.6.33.orig/fs/reiser4/vfs_ops.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/vfs_ops.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/vfs_ops.c linux-2.6.34/fs/reiser4/vfs_ops.c +--- linux-2.6.34.orig/fs/reiser4/vfs_ops.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/vfs_ops.c 2010-05-27 02:44:03.780648553 +0200 @@ -0,0 +1,267 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -75018,9 +74867,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/vfs_ops.c linux-2.6.33/fs/reiser4/vfs_ops + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/vfs_ops.h linux-2.6.33/fs/reiser4/vfs_ops.h ---- linux-2.6.33.orig/fs/reiser4/vfs_ops.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/vfs_ops.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/vfs_ops.h linux-2.6.34/fs/reiser4/vfs_ops.h +--- linux-2.6.34.orig/fs/reiser4/vfs_ops.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/vfs_ops.h 2010-05-27 02:44:03.780648553 +0200 @@ -0,0 +1,53 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -75075,9 +74924,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/vfs_ops.h linux-2.6.33/fs/reiser4/vfs_ops + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/wander.c linux-2.6.33/fs/reiser4/wander.c ---- linux-2.6.33.orig/fs/reiser4/wander.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/wander.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/wander.c linux-2.6.34/fs/reiser4/wander.c +--- linux-2.6.34.orig/fs/reiser4/wander.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/wander.c 2010-05-27 02:44:03.781648623 +0200 @@ -0,0 +1,1798 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -76877,9 +76726,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/wander.c linux-2.6.33/fs/reiser4/wander.c + fill-column: 80 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/wander.h linux-2.6.33/fs/reiser4/wander.h ---- linux-2.6.33.orig/fs/reiser4/wander.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/wander.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/wander.h linux-2.6.34/fs/reiser4/wander.h +--- linux-2.6.34.orig/fs/reiser4/wander.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/wander.h 2010-05-27 02:44:03.782648763 +0200 @@ -0,0 +1,135 @@ +/* Copyright 2002, 2003 by Hans Reiser, licensing governed by reiser4/README */ + @@ -77016,9 +76865,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/wander.h linux-2.6.33/fs/reiser4/wander.h + scroll-step: 1 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/writeout.h linux-2.6.33/fs/reiser4/writeout.h ---- linux-2.6.33.orig/fs/reiser4/writeout.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/writeout.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/writeout.h linux-2.6.34/fs/reiser4/writeout.h +--- linux-2.6.34.orig/fs/reiser4/writeout.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/writeout.h 2010-05-27 02:44:03.782648763 +0200 @@ -0,0 +1,21 @@ +/* Copyright 2002, 2003, 2004 by Hans Reiser, licensing governed by reiser4/README */ + @@ -77041,9 +76890,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/writeout.h linux-2.6.33/fs/reiser4/writeo + fill-column: 80 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/znode.c linux-2.6.33/fs/reiser4/znode.c ---- linux-2.6.33.orig/fs/reiser4/znode.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/znode.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/znode.c linux-2.6.34/fs/reiser4/znode.c +--- linux-2.6.34.orig/fs/reiser4/znode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/znode.c 2010-05-27 02:44:03.783648553 +0200 @@ -0,0 +1,1029 @@ +/* Copyright 2001, 2002, 2003 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -78074,9 +77923,9 @@ diff -urN linux-2.6.33.orig/fs/reiser4/znode.c linux-2.6.33/fs/reiser4/znode.c + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/fs/reiser4/znode.h linux-2.6.33/fs/reiser4/znode.h ---- linux-2.6.33.orig/fs/reiser4/znode.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.33/fs/reiser4/znode.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/fs/reiser4/znode.h linux-2.6.34/fs/reiser4/znode.h +--- linux-2.6.34.orig/fs/reiser4/znode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.34/fs/reiser4/znode.h 2010-05-27 02:44:03.784648623 +0200 @@ -0,0 +1,433 @@ +/* Copyright 2001, 2002, 2003, 2004 by Hans Reiser, licensing governed by + * reiser4/README */ @@ -78511,10 +78360,10 @@ diff -urN linux-2.6.33.orig/fs/reiser4/znode.h linux-2.6.33/fs/reiser4/znode.h + fill-column: 120 + End: +*/ -diff -urN linux-2.6.33.orig/include/linux/fs.h linux-2.6.33/include/linux/fs.h ---- linux-2.6.33.orig/include/linux/fs.h 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/include/linux/fs.h 2010-03-04 19:33:22.000000000 +0100 -@@ -511,6 +511,7 @@ +diff -urN linux-2.6.34.orig/include/linux/fs.h linux-2.6.34/include/linux/fs.h +--- linux-2.6.34.orig/include/linux/fs.h 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/include/linux/fs.h 2010-05-27 02:44:03.785649112 +0200 +@@ -514,6 +514,7 @@ struct page; struct address_space; struct writeback_control; @@ -78522,7 +78371,7 @@ diff -urN linux-2.6.33.orig/include/linux/fs.h linux-2.6.33/include/linux/fs.h struct iov_iter { const struct iovec *iov; -@@ -1567,7 +1568,11 @@ +@@ -1572,7 +1573,11 @@ int (*remount_fs) (struct super_block *, int *, char *); void (*clear_inode) (struct inode *); void (*umount_begin) (struct super_block *); @@ -78548,10 +78397,10 @@ diff -urN linux-2.6.33.orig/include/linux/fs.h linux-2.6.33/include/linux/fs.h extern int filemap_fdatawrite(struct address_space *); extern int filemap_flush(struct address_space *); extern int filemap_fdatawait(struct address_space *); -diff -urN linux-2.6.33.orig/include/linux/mm.h linux-2.6.33/include/linux/mm.h ---- linux-2.6.33.orig/include/linux/mm.h 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/include/linux/mm.h 2010-03-04 19:33:22.000000000 +0100 -@@ -850,6 +850,7 @@ +diff -urN linux-2.6.34.orig/include/linux/mm.h linux-2.6.34/include/linux/mm.h +--- linux-2.6.34.orig/include/linux/mm.h 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/include/linux/mm.h 2010-05-27 02:44:03.785649112 +0200 +@@ -853,6 +853,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping); int set_page_dirty(struct page *page); int set_page_dirty_lock(struct page *page); @@ -78559,9 +78408,9 @@ diff -urN linux-2.6.33.orig/include/linux/mm.h linux-2.6.33/include/linux/mm.h int clear_page_dirty_for_io(struct page *page); extern unsigned long move_page_tables(struct vm_area_struct *vma, -diff -urN linux-2.6.33.orig/include/linux/writeback.h linux-2.6.33/include/linux/writeback.h ---- linux-2.6.33.orig/include/linux/writeback.h 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/include/linux/writeback.h 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/include/linux/writeback.h linux-2.6.34/include/linux/writeback.h +--- linux-2.6.34.orig/include/linux/writeback.h 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/include/linux/writeback.h 2010-05-27 02:44:03.786649461 +0200 @@ -13,6 +13,12 @@ extern struct list_head inode_in_use; extern struct list_head inode_unused; @@ -78575,19 +78424,9 @@ diff -urN linux-2.6.33.orig/include/linux/writeback.h linux-2.6.33/include/linux /* * fs/fs-writeback.c */ -@@ -34,6 +40,9 @@ - enum writeback_sync_modes sync_mode; - unsigned long *older_than_this; /* If !NULL, only write back inodes - older than this */ -+ unsigned long wb_start; /* Time writeback_inodes_wb was -+ called. This is needed to avoid -+ extra jobs and livelock */ - long nr_to_write; /* Write this many pages, and decrement - this for each page written */ - long pages_skipped; /* Pages which were not written */ -diff -urN linux-2.6.33.orig/mm/filemap.c linux-2.6.33/mm/filemap.c ---- linux-2.6.33.orig/mm/filemap.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/mm/filemap.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/mm/filemap.c linux-2.6.34/mm/filemap.c +--- linux-2.6.34.orig/mm/filemap.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/mm/filemap.c 2010-05-27 02:44:03.787648693 +0200 @@ -139,6 +139,7 @@ dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE); } @@ -78612,9 +78451,9 @@ diff -urN linux-2.6.33.orig/mm/filemap.c linux-2.6.33/mm/filemap.c /** * do_generic_file_read - generic file read routine -diff -urN linux-2.6.33.orig/mm/page-writeback.c linux-2.6.33/mm/page-writeback.c ---- linux-2.6.33.orig/mm/page-writeback.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/mm/page-writeback.c 2010-03-04 19:33:22.000000000 +0100 +diff -urN linux-2.6.34.orig/mm/page-writeback.c linux-2.6.34/mm/page-writeback.c +--- linux-2.6.34.orig/mm/page-writeback.c 2010-05-16 23:17:36.000000000 +0200 ++++ linux-2.6.34/mm/page-writeback.c 2010-05-27 02:44:03.788648832 +0200 @@ -1130,6 +1130,32 @@ EXPORT_SYMBOL(__set_page_dirty_nobuffers); diff --git a/kernel.spec b/kernel.spec index 48c7ea72..d7088730 100644 --- a/kernel.spec +++ b/kernel.spec @@ -239,7 +239,7 @@ Patch49: kernel-zph.patch # based on http://www.linuximq.net/patchs/linux-2.6.32-imq-test2.diff Patch50: kernel-imq.patch -# http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-2.6.33.patch.bz2 +# http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-2.6.34.patch.bz2 Patch51: kernel-reiser4.patch # http://www.zz9.dk/patches/wrr-linux-071203-2.6.25.patch.gz