From 4c45b71afeb9aadf1ac4739b17907d16cf241977 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 4 Oct 2012 17:16:53 -0700
Subject: [PATCH] --- yaml --- r: 330200 b: refs/heads/master c:
 c99b6841d74a5c7d3698cc2a3ec44241fe64b769 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/omfs/file.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e6d7f73f78d6..568b7d599a56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0324b5a450f8a58304e93c5d886add24ca3527bc
+refs/heads/master: c99b6841d74a5c7d3698cc2a3ec44241fe64b769
diff --git a/trunk/fs/omfs/file.c b/trunk/fs/omfs/file.c
index 2c6d95257a4d..77e3cb2962b4 100644
--- a/trunk/fs/omfs/file.c
+++ b/trunk/fs/omfs/file.c
@@ -146,8 +146,7 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe,
 			be64_to_cpu(entry->e_blocks);
 
 		if (omfs_allocate_block(inode->i_sb, new_block)) {
-			entry->e_blocks =
-				cpu_to_be64(be64_to_cpu(entry->e_blocks) + 1);
+			be64_add_cpu(&entry->e_blocks, 1);
 			terminator->e_blocks = ~(cpu_to_be64(
 				be64_to_cpu(~terminator->e_blocks) + 1));
 			goto out;
@@ -177,7 +176,7 @@ static int omfs_grow_extent(struct inode *inode, struct omfs_extent *oe,
 		be64_to_cpu(~terminator->e_blocks) + (u64) new_count));
 
 	/* write in new entry */
-	oe->e_extent_count = cpu_to_be32(1 + be32_to_cpu(oe->e_extent_count));
+	be32_add_cpu(&oe->e_extent_count, 1);
 
 out:
 	*ret_block = new_block;