2000-11-24 04:34:34

by Steven Cole

[permalink] [raw]
Subject: [PATCH] for ReiserFS 3.5.27 on 2.2.18pre23

For those of you who may want to run ReiserFS
on 2.2.18pre23 using reiserfs-3.5.27,
you may find as I did that the main reiserfs patch,
linux-2.2.17-reiserfs-3.5.27-patch, fails like this:

patching file linux/include/linux/fs.h
Hunk #1 FAILED at 279.
Hunk #2 FAILED at 393.
Hunk #3 FAILED at 516.
Hunk #4 FAILED at 560.
4 out of 4 hunks FAILED -- saving rejects to file linux/include/linux/fs.h.rej

Here is a temporary fix. The following will patch linux/include/linux/fs.h
correctly. I am currently running 2.2.18pre23 with reiserfs 3.5.27 using
this patch:

diff -u linux/include/linux/fs.h.orig linux/include/linux/fs.h
--- linux/include/linux/fs.h.orig Thu Nov 23 18:25:10 2000
+++ linux/include/linux/fs.h Thu Nov 23 18:38:15 2000
@@ -280,6 +280,7 @@
#include <linux/adfs_fs_i.h>
#include <linux/qnx4_fs_i.h>
#include <linux/usbdev_fs_i.h>
+#include <linux/reiserfs_fs_i.h>

/*
* Attribute flags. These should be or-ed together to figure out what
@@ -395,6 +396,7 @@
struct adfs_inode_info adfs_i;
struct qnx4_inode_info qnx4_i;
struct usbdev_inode_info usbdev_i;
+ struct reiserfs_inode_info reiserfs_i;
struct socket socket_i;
void *generic_ip;
} u;
@@ -520,6 +522,7 @@
#include <linux/adfs_fs_sb.h>
#include <linux/qnx4_fs_sb.h>
#include <linux/usbdev_fs_sb.h>
+#include <linux/reiserfs_fs_sb.h>

extern struct list_head super_blocks;

@@ -564,6 +567,7 @@
struct adfs_sb_info adfs_sb;
struct qnx4_sb_info qnx4_sb;
struct usbdev_sb_info usbdevfs_sb;
+ struct reiserfs_sb_info reiserfs_sb;
void *generic_sbp;
} u;
/*