leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nilfs2: remove useless b_low and b_high fields from nilfs_bmap struct

Browse Source 
This will cut off 16 bytes from the nilfs_bmap struct which is
embedded in the on-memory inode of nilfs.

The b_high field was never used, and the b_low field stores a constant
value which can be determined by whether the inode uses btree for
block mapping or not.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi 2009-05-24 00:09:44 +09:00
parent e473c1f265
commit 3033342a0b
6 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nilfs2/bmap.c
View File

@ -101,8 +101,7 @@ static int nilfs_bmap_do_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
if (n < 0) if (n < 0)
return n; return n;
ret = nilfs_btree_convert_and_insert( ret = nilfs_btree_convert_and_insert(
bmap, key, ptr, keys, ptrs, n, bmap, key, ptr, keys, ptrs, n);
NILFS_BMAP_LARGE_LOW, NILFS_BMAP_LARGE_HIGH);
if (ret == 0) if (ret == 0)
bmap->b_u.u_flags |= NILFS_BMAP_LARGE; bmap->b_u.u_flags |= NILFS_BMAP_LARGE;
@ -158,8 +157,7 @@ static int nilfs_bmap_do_delete(struct nilfs_bmap *bmap, __u64 key)
if (n < 0) if (n < 0)
return n; return n;
ret = nilfs_direct_delete_and_convert( ret = nilfs_direct_delete_and_convert(
bmap, key, keys, ptrs, n, bmap, key, keys, ptrs, n);
NILFS_BMAP_SMALL_LOW, NILFS_BMAP_SMALL_HIGH);
if (ret == 0) if (ret == 0)
bmap->b_u.u_flags &= ~NILFS_BMAP_LARGE; bmap->b_u.u_flags &= ~NILFS_BMAP_LARGE;
@ -681,12 +679,7 @@ int nilfs_bmap_read(struct nilfs_bmap *bmap, struct nilfs_inode *raw_inode)
} }
return (bmap->b_u.u_flags & NILFS_BMAP_LARGE) ? return (bmap->b_u.u_flags & NILFS_BMAP_LARGE) ?
nilfs_btree_init(bmap, nilfs_btree_init(bmap) : nilfs_direct_init(bmap);
NILFS_BMAP_LARGE_LOW,
NILFS_BMAP_LARGE_HIGH) :
nilfs_direct_init(bmap,
NILFS_BMAP_SMALL_LOW,
NILFS_BMAP_SMALL_HIGH);
} }
/** /**

4
fs/nilfs2/bmap.h
View File

@ -125,8 +125,6 @@ static inline int nilfs_bmap_is_new_ptr(unsigned long ptr)
* @b_inode: owner of bmap * @b_inode: owner of bmap
* @b_ops: bmap operation table * @b_ops: bmap operation table
* @b_pops: bmap ptr operation table * @b_pops: bmap ptr operation table
* @b_low: low watermark of conversion
* @b_high: high watermark of conversion
* @b_last_allocated_key: last allocated key for data block * @b_last_allocated_key: last allocated key for data block
* @b_last_allocated_ptr: last allocated ptr for data block * @b_last_allocated_ptr: last allocated ptr for data block
* @b_state: state * @b_state: state
@ -140,8 +138,6 @@ struct nilfs_bmap {
struct inode *b_inode; struct inode *b_inode;
const struct nilfs_bmap_operations *b_ops; const struct nilfs_bmap_operations *b_ops;
const struct nilfs_bmap_ptr_operations *b_pops; const struct nilfs_bmap_ptr_operations *b_pops;
__u64 b_low;
__u64 b_high;
__u64 b_last_allocated_key; __u64 b_last_allocated_key;
__u64 b_last_allocated_ptr; __u64 b_last_allocated_ptr;
int b_state; int b_state;

22
fs/nilfs2/btree.c
View File

@ -1527,7 +1527,7 @@ static int nilfs_btree_check_delete(struct nilfs_bmap *bmap, __u64 key)
if (bh != NULL) if (bh != NULL)
brelse(bh); brelse(bh);
return (maxkey == key) && (nextmaxkey < bmap->b_low); return (maxkey == key) && (nextmaxkey < NILFS_BMAP_LARGE_LOW);
} }
static int nilfs_btree_gather_data(struct nilfs_bmap *bmap, static int nilfs_btree_gather_data(struct nilfs_bmap *bmap,
@ -1634,7 +1634,7 @@ static void
nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap, nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap,
__u64 key, __u64 ptr, __u64 key, __u64 ptr,
const __u64 *keys, const __u64 *ptrs, const __u64 *keys, const __u64 *ptrs,
int n, __u64 low, __u64 high, int n,
union nilfs_bmap_ptr_req *dreq, union nilfs_bmap_ptr_req *dreq,
union nilfs_bmap_ptr_req *nreq, union nilfs_bmap_ptr_req *nreq,
struct buffer_head *bh) struct buffer_head *bh)
@ -1652,7 +1652,7 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap,
/* convert and insert */ /* convert and insert */
btree = (struct nilfs_btree *)bmap; btree = (struct nilfs_btree *)bmap;
nilfs_btree_init(bmap, low, high); nilfs_btree_init(bmap);
if (nreq != NULL) { if (nreq != NULL) {
bmap->b_pops->bpop_commit_alloc_ptr(bmap, dreq); bmap->b_pops->bpop_commit_alloc_ptr(bmap, dreq);
bmap->b_pops->bpop_commit_alloc_ptr(bmap, nreq); bmap->b_pops->bpop_commit_alloc_ptr(bmap, nreq);
@ -1701,13 +1701,10 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap,
* @keys: * @keys:
* @ptrs: * @ptrs:
* @n: * @n:
* @low:
* @high:
*/ */
int nilfs_btree_convert_and_insert(struct nilfs_bmap *bmap, int nilfs_btree_convert_and_insert(struct nilfs_bmap *bmap,
__u64 key, __u64 ptr, __u64 key, __u64 ptr,
const __u64 *keys, const __u64 *ptrs, const __u64 *keys, const __u64 *ptrs, int n)
int n, __u64 low, __u64 high)
{ {
struct buffer_head *bh; struct buffer_head *bh;
union nilfs_bmap_ptr_req dreq, nreq, *di, *ni; union nilfs_bmap_ptr_req dreq, nreq, *di, *ni;
@ -1732,7 +1729,7 @@ int nilfs_btree_convert_and_insert(struct nilfs_bmap *bmap,
if (ret < 0) if (ret < 0)
return ret; return ret;
nilfs_btree_commit_convert_and_insert(bmap, key, ptr, keys, ptrs, n, nilfs_btree_commit_convert_and_insert(bmap, key, ptr, keys, ptrs, n,
low, high, di, ni, bh); di, ni, bh);
nilfs_bmap_add_blocks(bmap, stats.bs_nblocks); nilfs_bmap_add_blocks(bmap, stats.bs_nblocks);
return 0; return 0;
} }
@ -2245,14 +2242,11 @@ static const struct nilfs_btree_operations nilfs_btree_ops_p = {
.btop_assign = nilfs_btree_assign_p, .btop_assign = nilfs_btree_assign_p,
}; };
int nilfs_btree_init(struct nilfs_bmap *bmap, __u64 low, __u64 high) int nilfs_btree_init(struct nilfs_bmap *bmap)
{ {
struct nilfs_btree *btree; struct nilfs_btree *btree = (struct nilfs_btree *)bmap;
btree = (struct nilfs_btree *)bmap;
bmap->b_ops = &nilfs_btree_ops; bmap->b_ops = &nilfs_btree_ops;
bmap->b_low = low;
bmap->b_high = high;
switch (bmap->b_inode->i_ino) { switch (bmap->b_inode->i_ino) {
case NILFS_DAT_INO: case NILFS_DAT_INO:
btree->bt_ops = &nilfs_btree_ops_p; btree->bt_ops = &nilfs_btree_ops_p;
@ -2267,7 +2261,5 @@ int nilfs_btree_init(struct nilfs_bmap *bmap, __u64 low, __u64 high)
void nilfs_btree_init_gc(struct nilfs_bmap *bmap) void nilfs_btree_init_gc(struct nilfs_bmap *bmap)
{ {
bmap->b_low = NILFS_BMAP_LARGE_LOW;
bmap->b_high = NILFS_BMAP_LARGE_HIGH;
bmap->b_ops = &nilfs_btree_ops_gc; bmap->b_ops = &nilfs_btree_ops_gc;
} }

5
fs/nilfs2/btree.h
View File

@ -108,10 +108,9 @@ struct nilfs_btree {
int nilfs_btree_path_cache_init(void); int nilfs_btree_path_cache_init(void);
void nilfs_btree_path_cache_destroy(void); void nilfs_btree_path_cache_destroy(void);
int nilfs_btree_init(struct nilfs_bmap *, __u64, __u64); int nilfs_btree_init(struct nilfs_bmap *);
int nilfs_btree_convert_and_insert(struct nilfs_bmap *, __u64, __u64, int nilfs_btree_convert_and_insert(struct nilfs_bmap *, __u64, __u64,
const __u64 *, const __u64 *, const __u64 *, const __u64 *, int);
int, __u64, __u64);
void nilfs_btree_init_gc(struct nilfs_bmap *); void nilfs_btree_init_gc(struct nilfs_bmap *);
#endif /* _NILFS_BTREE_H */ #endif /* _NILFS_BTREE_H */

13
fs/nilfs2/direct.c
View File

@ -242,8 +242,7 @@ static int nilfs_direct_gather_data(struct nilfs_bmap *bmap,
} }
int nilfs_direct_delete_and_convert(struct nilfs_bmap *bmap, int nilfs_direct_delete_and_convert(struct nilfs_bmap *bmap,
__u64 key, __u64 *keys, __u64 *ptrs, __u64 key, __u64 *keys, __u64 *ptrs, int n)
int n, __u64 low, __u64 high)
{ {
struct nilfs_direct *direct; struct nilfs_direct *direct;
__le64 *dptrs; __le64 *dptrs;
@ -273,8 +272,7 @@ int nilfs_direct_delete_and_convert(struct nilfs_bmap *bmap,
dptrs[i] = NILFS_BMAP_INVALID_PTR; dptrs[i] = NILFS_BMAP_INVALID_PTR;
} }
nilfs_direct_init(bmap, low, high); nilfs_direct_init(bmap);
return 0; return 0;
} }
@ -410,14 +408,11 @@ static const struct nilfs_direct_operations nilfs_direct_ops_p = {
.dop_assign = nilfs_direct_assign_p, .dop_assign = nilfs_direct_assign_p,
}; };
int nilfs_direct_init(struct nilfs_bmap *bmap, __u64 low, __u64 high) int nilfs_direct_init(struct nilfs_bmap *bmap)
{ {
struct nilfs_direct *direct; struct nilfs_direct *direct = (struct nilfs_direct *)bmap;
direct = (struct nilfs_direct *)bmap;
bmap->b_ops = &nilfs_direct_ops; bmap->b_ops = &nilfs_direct_ops;
bmap->b_low = low;
bmap->b_high = high;
switch (bmap->b_inode->i_ino) { switch (bmap->b_inode->i_ino) {
case NILFS_DAT_INO: case NILFS_DAT_INO:
direct->d_ops = &nilfs_direct_ops_p; direct->d_ops = &nilfs_direct_ops_p;

4
fs/nilfs2/direct.h
View File

@ -70,9 +70,9 @@ struct nilfs_direct {
#define NILFS_DIRECT_KEY_MAX (NILFS_DIRECT_NBLOCKS - 1) #define NILFS_DIRECT_KEY_MAX (NILFS_DIRECT_NBLOCKS - 1)
int nilfs_direct_init(struct nilfs_bmap *, __u64, __u64); int nilfs_direct_init(struct nilfs_bmap *);
int nilfs_direct_delete_and_convert(struct nilfs_bmap *, __u64, __u64 *, int nilfs_direct_delete_and_convert(struct nilfs_bmap *, __u64, __u64 *,
__u64 *, int, __u64, __u64); __u64 *, int);
#endif /* _NILFS_DIRECT_H */ #endif /* _NILFS_DIRECT_H */