[PATCH] kdev_t updates

[PATCH] kdev_t updates

[Clive Davies]

The type definition of kdev_t has changed in 2.5.2. This patch updates 
a couple of files to reflect this. If its Ok, then I'll check it in.

diff -purN linux_2.5.2-rmk1/fs/jffs/inode-v23.c linux/fs/jffs/inode-v23.c
--- linux_2.5.2-rmk1/fs/jffs/inode-v23.c	Fri Jan  4 17:42:12 2002
+++ linux/fs/jffs/inode-v23.c	Wed Jan 16 10:42:18 2002
@@ -357,7 +357,7 @@ jffs_new_inode(const struct inode * dir,
 	inode->i_nlink = raw_inode->nlink;
 	inode->i_uid = raw_inode->uid;
 	inode->i_gid = raw_inode->gid;
-	inode->i_rdev = 0;
+	inode->i_rdev = NODEV;
 	inode->i_size = raw_inode->dsize;
 	inode->i_atime = raw_inode->atime;
 	inode->i_mtime = raw_inode->mtime;
diff -purN linux_2.5.2-rmk1/fs/jffs/jffs_fm.c linux/fs/jffs/jffs_fm.c
--- linux_2.5.2-rmk1/fs/jffs/jffs_fm.c	Wed Jan 16 09:06:59 2002
+++ linux/fs/jffs/jffs_fm.c	Wed Jan 16 10:41:21 2002
@@ -46,7 +46,7 @@ jffs_build_begin(struct jffs_control *c,
 	}
 	DJM(no_jffs_fmcontrol++);
 
-	mtd = get_mtd_device(NULL, MINOR(dev));
+	mtd = get_mtd_device(NULL, minor(dev));
 
 	if (!mtd) {
 		kfree(fmc);

Re: [PATCH] kdev_t updates

[David Woodhouse]

cdavies@altera.com said:
>  The type definition of kdev_t has changed in 2.5.2. This patch
> updates  a couple of files to reflect this. If its Ok, then I'll check
> it in.

Can you couple it with the appropriate magic in include/linux/compatmac.h 
and make sure that's included from the affected files?

Something like this ought to do it:

#if LINUX_KERNEL_CODE < KERNEL_VERSION(2,5,1)
#define minor(x) MINOR(x)
#define major(x) MAJOR(x)
#define NODEV 0
#else
#define to_kdev_t(x) (x)
#endif

--
dwmw2

Re: [PATCH] kdev_t updates

[Clive Davies]

> Something like this ought to do it:
>
> #if LINUX_KERNEL_CODE < KERNEL_VERSION(2,5,1)
> #define minor(x) MINOR(x)
> #define major(x) MAJOR(x)
> #define NODEV 0
> #else
> #define to_kdev_t(x) (x)
> #endif

Ok, done. I used 

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
#define minor(x) MINOR(x)
#define major(x) MAJOR(x)
#endif

as to_kdev_t & NODEV are appropriately defined in kdev_t.h before and after 
2.5.2