QUOTA cleanup: Use inode->i_blkbits to get block bits

PATCH Superseded Mingming Cao 2 participants 2 messages Nov 11, 2008

Subsystems (2)

VFS Diskquota

lore

Share & tools

lore

Mingming Cao

author

2008-11-11 01:40 UTC #0 lore raw

PATCH 1/2 QUOTA cleanup: Use inode->i_blkbits to get block bits

quota: Use inode->i_blkbits to get block bits

From: Mingming Cao <[email protected]>

Andrew has suggested to use inode->i_blkbits to get the block bits info, rather than use super block's blockbits. That should be faster and emit less code.

Signed-off-by Mingming Cao <[email protected]>

---
 include/linux/quotaops.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

include/linux/quotaops.h +6 -6

Index: linux-2.6.28-rc2/include/linux/quotaops.h
===================================================================
@@ -399,26 +399,26 @@ static inline void vfs_dq_free_space(str
 static inline int vfs_dq_prealloc_block_nodirty(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_prealloc_space_nodirty(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_prealloc_block(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_prealloc_space(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_alloc_block_nodirty(struct inode *inode, qsize_t nr)
 {
  	return vfs_dq_alloc_space_nodirty(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 
 static inline int vfs_dq_alloc_block(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_alloc_space(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_reserve_block(struct inode *inode, qsize_t nr)

@@ -441,12 +441,12 @@ void vfs_dq_release_reservation(struct i
 
 static inline void vfs_dq_free_block_nodirty(struct inode *inode, qsize_t nr)
 {
-	vfs_dq_free_space_nodirty(inode, nr << inode->i_sb->s_blocksize_bits);
+	vfs_dq_free_space_nodirty(inode, nr << inode->i_blkbits);
 }
 
 static inline void vfs_dq_free_block(struct inode *inode, qsize_t nr)
 {
-	vfs_dq_free_space(inode, nr << inode->i_sb->s_blocksize_bits);
+	vfs_dq_free_space(inode, nr << inode->i_blkbits);
 }
 
 /*

Christoph Hellwig

2008-11-11 08:48 UTC #1 lore raw

Quoted 35 lines · Mingming Cao

quota: Use inode->i_blkbits to get block bits
From: Mingming Cao <[email protected]>
Andrew has suggested to use inode->i_blkbits to get the block bits info, rather than use super block's blockbits. That should be faster and emit less code.
Signed-off-by Mingming Cao <[email protected]>
---
 include/linux/quotaops.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6.28-rc2/include/linux/quotaops.h
===================================================================
include/linux/quotaops.h +2 -2
@@ -399,26 +399,26 @@ static inline void vfs_dq_free_space(str
 static inline int vfs_dq_prealloc_block_nodirty(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_prealloc_space_nodirty(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_prealloc_block(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_prealloc_space(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 static inline int vfs_dq_alloc_block_nodirty(struct inode *inode, qsize_t nr)
 {
  	return vfs_dq_alloc_space_nodirty(inode,

include/linux/quotaops.h static inline void vfs_dq_free_space(str · line 421

Quoted 10 lines

include/linux/quotaops.h +2 -2

-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);
 }
 
 
 static inline int vfs_dq_alloc_block(struct inode *inode, qsize_t nr)
 {
 	return vfs_dq_alloc_space(inode,
-			nr << inode->i_sb->s_blocksize_bits);
+			nr << inode->i_blkbits);

All these cals no fit onto a single line.