[Ocfs2-commits] bryce commits r1683 - branches/bryce/src

[svn-commits at oss.oracle.com]

Author: bryce
Date: 2004-12-01 06:43:14 -0600 (Wed, 01 Dec 2004)
New Revision: 1683

Modified:
   branches/bryce/src/inode.c
Log:
There be /evil/
cl->cl_recs[group->bryce_bg_chain].bryce_c_free +=  cpu_to_le32(count);
    ______________________________
                  |
This is getting a referance from a struct member held in BE format...
I'm REALLY unhappy/unsure how to get out of this mess. I don't believe the
change I made is correct.

fe->bryce_i_flags &= cpu_to_le32((~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL)));
converting bits,... not terribly happy about this but in theory it's
correct



Modified: branches/bryce/src/inode.c
===================================================================
--- branches/bryce/src/inode.c	2004-12-01 12:35:27 UTC (rev 1682)
+++ branches/bryce/src/inode.c	2004-12-01 12:43:14 UTC (rev 1683)
@@ -733,8 +733,8 @@
 		goto bail;
 	}
 
-	cpu_to_le64(fe->bryce_i_dtime) = OCFS_CURRENT_TIME;
-	cpu_to_le32(fe->bryce_i_flags) &= (~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
+	fe->bryce_i_dtime = cpu_to_le64(OCFS_CURRENT_TIME);
+	fe->bryce_i_flags &= cpu_to_le32((~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL)));
 
 	status = ocfs_journal_dirty(handle, fe_bh);
 	if (status < 0) {
@@ -973,17 +973,17 @@
 	}
 
 	spin_lock(&OCFS_I(inode)->ip_lock);
-	cpu_to_le32(fe->bryce_i_clusters) = OCFS_I(inode)->ip_clusters;
+	fe->bryce_i_clusters = cpu_to_le32(OCFS_I(inode)->ip_clusters);
 	spin_unlock(&OCFS_I(inode)->ip_lock);
 
-	cpu_to_le64(fe->bryce_i_size) = (u64)inode->i_size;
-	cpu_to_le16(fe->bryce_i_links_count) = inode->i_nlink;
-	cpu_to_le32(fe->bryce_i_uid) = inode->i_uid;
-	cpu_to_le32(fe->bryce_i_gid) = inode->i_gid;
-	cpu_to_le16(fe->bryce_i_mode) = inode->i_mode;
-	cpu_to_le64(fe->bryce_i_atime) = ocfs_get_seconds(inode->i_atime);
-	cpu_to_le64(fe->bryce_i_ctime) = ocfs_get_seconds(inode->i_ctime);
-	cpu_to_le64(fe->bryce_i_mtime) = ocfs_get_seconds(inode->i_mtime);
+	fe->bryce_i_size = cpu_to_le64(inode->i_size);
+	fe->bryce_i_links_count = cpu_to_le16(inode->i_nlink);
+	fe->bryce_i_uid = cpu_to_le32(inode->i_uid);
+	fe->bryce_i_gid = cpu_to_le32(inode->i_gid);
+	fe->bryce_i_mode = cpu_to_le16(inode->i_mode);
+	fe->bryce_i_atime = cpu_to_le64(ocfs_get_seconds(inode->i_atime));
+	fe->bryce_i_ctime = cpu_to_le64(ocfs_get_seconds(inode->i_ctime));
+	fe->bryce_i_mtime = cpu_to_le64(ocfs_get_seconds(inode->i_mtime));
 #warning "do we want to update these here?"
 //	fe->i_dtime = ocfs_get_seconds(inode->i_dtime);
 //	fe->i_generation = inode->i_generation;