[Ocfs2-commits] khackel commits r1267 - trunk/src

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-07-14 22:09:55 -0500 (Wed, 14 Jul 2004)
New Revision: 1267

Modified:
   trunk/src/file.c
Log:
sector size not blocksize

Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-07-15 03:05:42 UTC (rev 1266)
+++ trunk/src/file.c	2004-07-15 03:09:55 UTC (rev 1267)
@@ -694,11 +694,12 @@
 	}
 
 #if 0
+	int sector_size = 1 << osb->s_sectsize_bits;
 	if (filp->f_flags & O_DIRECT) {
 		/* anything special for o_direct? */
 		LOG_TRACE_STR ("O_DIRECT");
-		if (((*ppos) & (sb->s_blocksize - 1)) || (count & (sb->s_blocksize - 1)) || 
-		    ((unsigned long)buf & (sb->s_blocksize - 1)) || (inode->i_size & (sb->s_blocksize - 1))) {
+		if (((*ppos) & (sector_size - 1)) || (count & (sector_size - 1)) || 
+		    ((unsigned long)buf & (sector_size - 1)) || (inode->i_size & (sector_size - 1))) {
 			filp->f_flags &= ~O_DIRECT;
 		}
 	}
@@ -800,6 +801,7 @@
 	ocfs_super *osb = NULL;
 	struct inode *inode = filp->f_dentry->d_inode;
 	int status = 0;
+	int sector_size;
 
 	LOG_SET_CONTEXT(READ);
 
@@ -815,13 +817,14 @@
 	}
 
 	osb = OCFS_SB(inode->i_sb);
+	sector_size = 1 << osb->s_sectsize_bits;
 
 	if (filp->f_flags & O_DIRECT) {
 		/* anything special for o_direct? */
 		LOG_TRACE_STR ("O_DIRECT");
 
-		if (((*ppos) & (sb->s_blocksize - 1)) || (count & (sb->s_blocksize - 1)) || 
-		    ((unsigned long)buf & (sb->s_blocksize - 1)) || (inode->i_size & (sb->s_blocksize - 1))) {
+		if (((*ppos) & (sector_size - 1)) || (count & (sector_size - 1)) || 
+		    ((unsigned long)buf & (sector_size - 1)) || (inode->i_size & (sector_size - 1))) {
 			filp->f_flags &= ~O_DIRECT;
 		}
 	}