From 919c94baf73f966fca476cf99a9a20ba80f7ac28 Mon Sep 17 00:00:00 2001 From: Shaun Zinck Date: Fri, 31 Aug 2007 12:57:28 -0500 Subject: [PATCH] --- yaml --- r: 76103 b: refs/heads/master c: a7fe0ba7eee4f7c53077ff2bed2b581db17d00df h: refs/heads/master i: 76101: c64ba8d58e46ada29a1f8afa67fb6a3124391837 76099: 42946cbae94949660c2a3a1ba93c0830e8eac8e9 76095: b90b586e4f5693ae03cd62219e6ec53d5943414c v: v3 --- [refs] | 2 +- trunk/fs/jfs/jfs_dtree.h | 4 ++-- trunk/fs/jfs/resize.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e55dcc0fc2b3..4b3c3f48578b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb3a711d6a1c8a4697a2e89d09048353b8aefd3 +refs/heads/master: a7fe0ba7eee4f7c53077ff2bed2b581db17d00df diff --git a/trunk/fs/jfs/jfs_dtree.h b/trunk/fs/jfs/jfs_dtree.h index 8561c6ecece0..cdac2d5bafeb 100644 --- a/trunk/fs/jfs/jfs_dtree.h +++ b/trunk/fs/jfs/jfs_dtree.h @@ -74,7 +74,7 @@ struct idtentry { #define DTIHDRDATALEN 11 /* compute number of slots for entry */ -#define NDTINTERNAL(klen) ( ((4 + (klen)) + (15 - 1)) / 15 ) +#define NDTINTERNAL(klen) (DIV_ROUND_UP((4 + (klen)), 15)) /* @@ -133,7 +133,7 @@ struct dir_table_slot { ( ((s64)((dts)->addr1)) << 32 | __le32_to_cpu((dts)->addr2) ) /* compute number of slots for entry */ -#define NDTLEAF_LEGACY(klen) ( ((2 + (klen)) + (15 - 1)) / 15 ) +#define NDTLEAF_LEGACY(klen) (DIV_ROUND_UP((2 + (klen)), 15)) #define NDTLEAF NDTINTERNAL diff --git a/trunk/fs/jfs/resize.c b/trunk/fs/jfs/resize.c index 71984ee95346..7f24a0bb08ca 100644 --- a/trunk/fs/jfs/resize.c +++ b/trunk/fs/jfs/resize.c @@ -172,7 +172,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize) */ t64 = ((newLVSize - newLogSize + BPERDMAP - 1) >> L2BPERDMAP) << L2BPERDMAP; - t32 = ((t64 + (BITSPERPAGE - 1)) / BITSPERPAGE) + 1 + 50; + t32 = DIV_ROUND_UP(t64, BITSPERPAGE) + 1 + 50; newFSCKSize = t32 << sbi->l2nbperpage; newFSCKAddress = newLogAddress - newFSCKSize;