[Ocfs2-commits] manish commits r977 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-02 18:18:27 -0500 (Wed, 02 Jun 2004)
New Revision: 977

Modified:
   trunk/src/inode.c
Log:
Get rid of 2.4/2.6 dev_t/kdev_t differences. From Christoph Hellwig.


Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-06-02 20:52:44 UTC (rev 976)
+++ trunk/src/inode.c	2004-06-02 23:18:27 UTC (rev 977)
@@ -1873,12 +1873,6 @@
 		case OCFS_ATTRIB_BLOCK:
 		case OCFS_ATTRIB_FIFO:
 		case OCFS_ATTRIB_SOCKET:
-		{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-			dev_t dev;
-#else
-			kdev_t kdev;
-#endif
 			if (fe->attribs == OCFS_ATTRIB_CHAR)
 				inode->i_mode |= S_IFCHR;
 			else if (fe->attribs == OCFS_ATTRIB_BLOCK)
@@ -1889,20 +1883,10 @@
 				inode->i_mode |= S_IFSOCK;
 
 			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
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-			init_special_inode (inode, inode->i_mode, dev);
-#else
-			init_special_inode (inode, inode->i_mode, 
-					    kdev_t_to_nr(kdev));
-#endif
+			init_special_inode (inode, inode->i_mode,
+					    MKDEV(fe->dev_major,
+						  fe->dev_minor));
 			break;
-		}
 		default:
 			LOG_ERROR_ARGS ("attribs=%d", fe->attribs);
 			inode->i_mode |= S_IFREG;