packages: kernel/kernel-reiser4.patch, kernel/kernel.spec - reiser4 patch u...
arekm
arekm at pld-linux.org
Fri May 28 10:56:32 CEST 2010
Author: arekm Date: Fri May 28 08:56:32 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- reiser4 patch updated
---- Files affected:
packages/kernel:
kernel-reiser4.patch (1.11 -> 1.12) , kernel.spec (1.789 -> 1.790)
---- Diffs:
================================================================
Index: packages/kernel/kernel-reiser4.patch
diff -u packages/kernel/kernel-reiser4.patch:1.11 packages/kernel/kernel-reiser4.patch:1.12
--- packages/kernel/kernel-reiser4.patch:1.11 Sun May 23 11:02:11 2010
+++ packages/kernel/kernel-reiser4.patch Fri May 28 10:56:26 2010
@@ -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 @@
Xfsprogs
--------
o <ftp://oss.sgi.com/projects/xfs/download/>
-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 @@
+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 @@
+ }
+}
+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 @@
/*
* 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 @@
+ * 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 @@
/*
* 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 @@
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 @@
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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ * 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ * 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ * 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 @@
+ 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 @@
+ 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 @@
+ * 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 @@
+ 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 @@
+ * 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 */
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-reiser4.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.789&r2=1.790&f=u
More information about the pld-cvs-commit
mailing list