[Ocfs2-commits] mfasheh commits r817 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-29 16:45:03 -0600 (Mon, 29 Mar 2004)
New Revision: 817

Modified:
   trunk/src/inc/ocfs.h
   trunk/src/inode.c
Log:
* include a patch by Rusty Lynch <rusty at linux.co.intel.com> to
  properly set inode->i_rdev in ocfs_populate_inode.

* remove OCFS_SET_INODE_DEV from ocfs.h as it was wrong, and is no
  longer used anyway




Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-03-29 21:59:10 UTC (rev 816)
+++ trunk/src/inc/ocfs.h	2004-03-29 22:45:03 UTC (rev 817)
@@ -1135,15 +1135,12 @@
 #define alloc_kiovec_sz(nr, buf, bh)    alloc_kiovec(nr, buf)
 #endif
 
-/* Operates on a struct super_block * */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#define OCFS_SET_INODE_DEV(sb, inode)   (inode->i_rdev = sb->s_dev)
 typedef struct block_device * ocfs_blockdev;
 typedef dev_t ocfs_dev;
 #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)
 typedef kdev_t ocfs_blockdev;
 typedef int ocfs_dev;
 #define OCFS_NODEV     NODEV

Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-03-29 21:59:10 UTC (rev 816)
+++ trunk/src/inode.c	2004-03-29 22:45:03 UTC (rev 817)
@@ -260,7 +260,7 @@
 		goto bail;
 	}
 	
-	OCFS_SET_INODE_DEV(sb, inode);
+	inode->i_rdev = MKDEV (fe->dev_major, fe->dev_minor);
 	inode->i_mode = mode;
 	inode->i_uid = fe->uid;
 	inode->i_gid = fe->gid;