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

[svn-commits at oss.oracle.com]

Author: bryce
Date: 2004-12-01 07:18:09 -0600 (Wed, 01 Dec 2004)
New Revision: 1684

Modified:
   branches/bryce/src/file.c
Log:
cpu_to_xx moved to RHS of expressions



Modified: branches/bryce/src/file.c
===================================================================
--- branches/bryce/src/file.c	2004-12-01 12:43:14 UTC (rev 1683)
+++ branches/bryce/src/file.c	2004-12-01 13:18:09 UTC (rev 1684)
@@ -66,19 +66,19 @@
 static void ocfs_fe_set_attributes(ocfs2_dinode *fe, struct iattr *attr)
 {
 	if (attr->ia_valid & ATTR_SIZE)
-		cpu_to_le64(fe->bryce_i_size) = attr->ia_size;
+		fe->bryce_i_size = cpu_to_le64(attr->ia_size);
 	if (attr->ia_valid & ATTR_UID)
-		cpu_to_le32(fe->bryce_i_uid) = attr->ia_uid;
+		fe->bryce_i_uid = cpu_to_le32(attr->ia_uid);
 	if (attr->ia_valid & ATTR_GID)
-		cpu_to_le32(fe->bryce_i_gid) = attr->ia_gid;
+		fe->bryce_i_gid = cpu_to_le32(attr->ia_gid);
 	if (attr->ia_valid & ATTR_MODE)
-		cpu_to_le16(fe->bryce_i_mode) = attr->ia_mode;
+		fe->bryce_i_mode = cpu_to_le16(attr->ia_mode);
 	if (attr->ia_valid & ATTR_CTIME)
-		cpu_to_le64(fe->bryce_i_ctime) = ocfs_get_seconds(attr->ia_ctime);
+		fe->bryce_i_ctime = cpu_to_le64(ocfs_get_seconds(attr->ia_ctime));
 	if (attr->ia_valid & ATTR_ATIME)
-		cpu_to_le64(fe->bryce_i_atime) = ocfs_get_seconds(attr->ia_atime);
+		fe->bryce_i_atime = cpu_to_le64(ocfs_get_seconds(attr->ia_atime));
 	if (attr->ia_valid & ATTR_MTIME)
-		cpu_to_le64(fe->bryce_i_mtime) = ocfs_get_seconds(attr->ia_mtime);
+		fe->bryce_i_mtime = cpu_to_le64(ocfs_get_seconds(attr->ia_mtime));
 }
 
 int ocfs_sync_inode(struct inode *inode)
@@ -357,7 +357,7 @@
 
 	fe = (ocfs2_dinode *) bh->b_data;
 
-	cpu_to_le64(fe->bryce_i_mtime) = OCFS_CURRENT_TIME;
+	fe->bryce_i_mtime = cpu_to_le64(OCFS_CURRENT_TIME);
 
 	ocfs_fe_set_attributes(fe, attr);
 
@@ -1010,7 +1010,7 @@
 		goto leave;
 	}
 
-	cpu_to_le32(fe->bryce_i_clusters) += num_bits;
+	fe->bryce_i_clusters += cpu_to_le32(num_bits);
 	spin_lock(&OCFS_I(inode)->ip_lock);
 	OCFS_I(inode)->ip_clusters = le32_to_cpu(fe->bryce_i_clusters);
 	spin_unlock(&OCFS_I(inode)->ip_lock);
@@ -1210,10 +1210,9 @@
 
 			/* update i_size in case we crash after the
 			 * extend_trans */
-			cpu_to_le64(fe->bryce_i_size) =
-				ocfs2_clusters_to_bytes(osb->sb,
-							le32_to_cpu(fe->bryce_i_clusters));
-			cpu_to_le64(fe->bryce_i_mtime) = OCFS_CURRENT_TIME;
+			fe->bryce_i_size4 = cpu_to_le64(ocfs2_clusters_to_bytes(osb->sb,
+							le32_to_cpu(fe->bryce_i_clusters)));
+			fe->bryce_i_mtime = cpu_to_le64(OCFS_CURRENT_TIME);
 
 			status = ocfs_journal_dirty(handle, bh);
 			if (status < 0) {
@@ -1248,7 +1247,7 @@
 	if (new_i_size > ocfs2_clusters_to_bytes(osb->sb, le32_to_cpu(fe->bryce_i_clusters)))
 		le64_to_cpu(fe->bryce_i_size) = ocfs2_clusters_to_bytes(osb->sb, le32_to_cpu(fe->bryce_i_clusters));
 	else
-		cpu_to_le64(fe->bryce_i_size) = new_i_size;
+		fe->bryce_i_size = cpu_to_le64(new_i_size);
 #warning "is there a reason why we don't update i_blocks here?"
 	LOG_TRACE_ARGS("fe: i_clusters = %u, i_size=%llu\n", 
 		       le32_to_cpu(fe->bryce_i_clusters), le64_to_cpu(fe->bryce_i_size));
@@ -1256,7 +1255,7 @@
 	LOG_TRACE_ARGS("inode: ip_clusters=%u, i_size=%llu\n",
 		       OCFS_I(inode)->ip_clusters, inode->i_size);
 
-	cpu_to_le64(fe->bryce_i_mtime) = OCFS_CURRENT_TIME;
+	fe->bryce_i_mtime = cpu_to_le64(OCFS_CURRENT_TIME);
 
 	status = ocfs_journal_dirty(handle, bh);
 	if (status < 0) {