Patch: linux-2.5.2-pre8/fs/jffs2 compilation fixes

Patch: linux-2.5.2-pre8/fs/jffs2 compilation fixes

[Adam J. Richter]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

	linux-2.5.2-pre8/fs/jffs2 required a few minor
changes to make it compile.  dir.c needed to include <linux/sched.h>
for CURRENT_TIME, and there were a couple of kdev-related changes.
Here is the patch.

	It compiles.  I have not otherwise tested it.

-- 
Adam J. Richter     __     ______________   4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com     \ /                  San Jose, California 95129-1034
+1 408 261-6630         | g g d r a s i l   United States of America
fax +1 408 261-6631      "Free Software For The Rest Of Us."

[-- Attachment #2: jffs2.diffs --]
[-- Type: text/plain, Size: 1373 bytes --]

Only in linux/fs/jffs2: CVS
diff -u -r linux-2.5.2-pre8/fs/jffs2/dir.c linux/fs/jffs2/dir.c
--- linux-2.5.2-pre8/fs/jffs2/dir.c	Fri Jan  4 19:40:37 2002
+++ linux/fs/jffs2/dir.c	Sat Jan  5 04:59:07 2002
@@ -37,6 +37,7 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/sched.h>	/* for CURRENT_TIME */
 #include <linux/fs.h>
 #include <linux/jffs2.h>
 #include <linux/jffs2_fs_i.h>
diff -u -r linux-2.5.2-pre8/fs/jffs2/readinode.c linux/fs/jffs2/readinode.c
--- linux-2.5.2-pre8/fs/jffs2/readinode.c	Fri Sep 14 14:04:07 2001
+++ linux/fs/jffs2/readinode.c	Sat Jan  5 04:59:07 2002
@@ -437,7 +437,7 @@
 	case S_IFSOCK:
 	case S_IFIFO:
 		inode->i_op = &jffs2_file_inode_operations;
-		init_special_inode(inode, inode->i_mode, kdev_t_to_nr(MKDEV(rdev>>8, rdev&0xff)));
+		init_special_inode(inode, inode->i_mode, MKDEV(rdev>>8, rdev&0xff));
 		break;
 
 	default:
diff -u -r linux-2.5.2-pre8/fs/jffs2/super.c linux/fs/jffs2/super.c
--- linux-2.5.2-pre8/fs/jffs2/super.c	Fri Jan  4 19:40:37 2002
+++ linux/fs/jffs2/super.c	Sat Jan  5 04:59:07 2002
@@ -208,7 +208,7 @@
 	c = JFFS2_SB_INFO(sb);
 	memset(c, 0, sizeof(*c));
 	
-	c->mtd = get_mtd_device(NULL, MINOR(sb->s_dev));
+	c->mtd = get_mtd_device(NULL, minor(sb->s_dev));
 	if (!c->mtd) {
 		D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", MINOR(sb->s_dev)));
 		return NULL;

Re: Patch: linux-2.5.2-pre8/fs/jffs2 compilation fixes

[David Woodhouse]

adam@yggdrasil.com said:
> dir.c needed to include <linux/sched.h> for CURRENT_TIME, and there
> were a couple of kdev-related changes. Here is the patch.

Thanks. This, and the JFFS changes, look OK. I've merged the sched.h 
inclusion into CVS, albeit without the comment - the Linux include files 
are screwed up enough that it's best not to pretend there's any logic 
behind what you have to include :)

I'm not merging the s/MAJOR/major/ changes into my tree just yet - I'm still
vaguely hoping the new macro will change name before 2.5.2 proper.

--
dwmw2