Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7fe0ba7 authored by Shaun Zinck's avatar Shaun Zinck Committed by Dave Kleikamp
Browse files

JFS: use DIV_ROUND_UP where appropriate 



This replaces some macros and code, which do the same thing as DIV_ROUND_UP
defined in kernel.h, to use the DIV_ROUND_UP macro.

Signed-off-by: default avatarShaun Zinck <shaun.zinck@gmail.com>
Signed-off-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
parent 1eb3a711

fs/jfs/jfs_dtree.h

+2 −2
Original line number Diff line number Diff line
@@ -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

fs/jfs/resize.c

+1 −1
Original line number Diff line number Diff line
@@ -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;