2.6 fixes in oin.c

PATCH New Rusty Lynch 3 participants 4 messages Feb 19, 2004 – Feb 23, 2004 OCFS2

Share & tools

Rusty Lynch

author

2004-02-19 17:58 UTC #0 lore raw

PATCH 1/1 2.6 fixes in oin.c

The following is a small 2.6 port patch to oin.c that replaces the LINUX_2_5 conditionals with the normal LINUX_VERSION_CODE, and changes an assignment of NODEV to OCFS_NODEV along with a fix in ocfs.h that makes the OCFS_NODEV correct for 2.6 kernels.

    --rusty

oin.c +4 -4

Index: src/oin.c
===================================================================
@@ -154,7 +154,7 @@
 			    case OCFS_ATTRIB_FIFO:
 			    case OCFS_ATTRIB_SOCKET:
 			    {
-#ifdef LINUX_2_5
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    dev_t dev;
 #else
 				    kdev_t kdev;

@@ -168,14 +168,14 @@
 				    else if (fe->attribs == OCFS_ATTRIB_SOCKET)
 					    inode->i_mode |= S_IFSOCK;
 
-				    inode->i_rdev = NODEV;
-#ifdef LINUX_2_5
+				    inode->i_rdev = OCFS_NODEV;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    dev = MKDEV (fe->dev_major, fe->dev_minor);
 #else
 				    kdev = MKDEV (fe->dev_major, fe->dev_minor);
 #endif
 
-#ifdef LINUX_2_5
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    init_special_inode (inode, inode->i_mode,
 							dev);
 #else

Rusty Lynch

author

2004-02-19 18:12 UTC #1 lore raw

PATCH 1/1 2.6 fixes in oin.c

Quoted 6 lines · Rusty Lynch

The following is a small 2.6 port patch to oin.c that replaces the LINUX_2_5 conditionals with the normal LINUX_VERSION_CODE, and changes an assignment of NODEV to OCFS_NODEV along with a fix in ocfs.h that makes the OCFS_NODEV correct for 2.6 kernels.
    --rusty

#@#$#!!! here is a version that also includes changes to ocfs.h

oin.c +4 -4

Index: src/oin.c
===================================================================
@@ -154,7 +154,7 @@
 			    case OCFS_ATTRIB_FIFO:
 			    case OCFS_ATTRIB_SOCKET:
 			    {
-#ifdef LINUX_2_5
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    dev_t dev;
 #else
 				    kdev_t kdev;

@@ -168,14 +168,14 @@
 				    else if (fe->attribs == OCFS_ATTRIB_SOCKET)
 					    inode->i_mode |= S_IFSOCK;
 
-				    inode->i_rdev = NODEV;
-#ifdef LINUX_2_5
+				    inode->i_rdev = OCFS_NODEV;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    dev = MKDEV (fe->dev_major, fe->dev_minor);
 #else
 				    kdev = MKDEV (fe->dev_major, fe->dev_minor);
 #endif
 
-#ifdef LINUX_2_5
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    init_special_inode (inode, inode->i_mode,
 							dev);
 #else

inc/ocfs.h +1 -1

Index: src/inc/ocfs.h
===================================================================
@@ -1136,7 +1136,7 @@
 #define OCFS_SET_INODE_DEV(sb, inode)   (inode->i_rdev = sb->sdev)
 typedef struct block_device * ocfs_blockdev;
 typedef dev_t ocfs_dev;
-#define OCFS_NODEV     NODEV.value
+#define OCFS_NODEV     0
 #define OCFS_GET_BLOCKDEV(sb)   ((sb)->s_bdev)
 #else /* 2.4 kernel */
 #define OCFS_SET_INODE_DEV(sb, inode)   (inode->i_dev = sb->s_dev)

Wim Coekaerts

2004-02-19 18:15 UTC #2 lore raw

PATCH 1/1 2.6 fixes in oin.c

Quoted 1 line

#@#$#!!! here is a version that also includes changes to ocfs.h

Mark Fasheh

2004-02-23 17:49 UTC #3 lore raw

PATCH 1/1 2.6 fixes in oin.c

In reply to Rusty Lynch

Alright, commited this one.

	--Mark

Quoted 46 lines · Rusty Lynch

Quoted 6 lines · Rusty Lynch
The following is a small 2.6 port patch to oin.c that replaces the LINUX_2_5 conditionals with the normal LINUX_VERSION_CODE, and changes an assignment of NODEV to OCFS_NODEV along with a fix in ocfs.h that makes the OCFS_NODEV correct for 2.6 kernels.
    --rusty
#@#$#!!! here is a version that also includes changes to ocfs.h
Index: src/oin.c
===================================================================
oin.c +4 -4
@@ -154,7 +154,7 @@
 			    case OCFS_ATTRIB_FIFO:
 			    case OCFS_ATTRIB_SOCKET:
 			    {
-#ifdef LINUX_2_5
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    dev_t dev;
 #else
 				    kdev_t kdev;
@@ -168,14 +168,14 @@
 				    else if (fe->attribs == OCFS_ATTRIB_SOCKET)
 					    inode->i_mode |= S_IFSOCK;
 
-				    inode->i_rdev = NODEV;
-#ifdef LINUX_2_5
+				    inode->i_rdev = OCFS_NODEV;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    dev = MKDEV (fe->dev_major, fe->dev_minor);
 #else
 				    kdev = MKDEV (fe->dev_major, fe->dev_minor);
 #endif
 
-#ifdef LINUX_2_5
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 				    init_special_inode (inode, inode->i_mode,
 							dev);
 #else
Index: src/inc/ocfs.h
===================================================================

inc/ocfs.h line 1142

Quoted 8 lines

inc/ocfs.h +1 -1

@@ -1136,7 +1136,7 @@
 #define OCFS_SET_INODE_DEV(sb, inode)   (inode->i_rdev = sb->sdev)
 typedef struct block_device * ocfs_blockdev;
 typedef dev_t ocfs_dev;
-#define OCFS_NODEV     NODEV.value
+#define OCFS_NODEV     0
 #define OCFS_GET_BLOCKDEV(sb)   ((sb)->s_bdev)
 #else /* 2.4 kernel */
 #define OCFS_SET_INODE_DEV(sb, inode)   (inode->i_dev = sb->s_dev)

--
Mark Fasheh
Software Developer, Oracle Corp
[email protected]