vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/fs/nilfs2.c (-grub_nilfs2_palloc_groups_per_desc_block):

Browse source 
Rename to ...
	(grub_nilfs2_palloc_log_groups_per_desc_block): ... this. Return log
	of groups_per_block. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-01-05 16:53:04 +01:00
parent 10ca8645cc
commit 21d1b9a029
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-01-05 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/nilfs2.c (-grub_nilfs2_palloc_groups_per_desc_block):
Rename to ...
(grub_nilfs2_palloc_log_groups_per_desc_block): ... this. Return log
of groups_per_block. All users updated.
2013-01-05 Vladimir Serbinenko <phcoder@gmail.com> 2013-01-05 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (grub_diskfilter_write): Call * grub-core/disk/diskfilter.c (grub_diskfilter_write): Call

20
grub-core/fs/nilfs2.c
View file

@ -214,6 +214,8 @@ struct grub_nilfs2_palloc_group_desc
grub_uint32_t pg_nfrees; grub_uint32_t pg_nfrees;
}; };
#define LOG_SIZE_GROUP_DESC 2
#define LOG_NILFS_DAT_ENTRY_SIZE 5 #define LOG_NILFS_DAT_ENTRY_SIZE 5
struct grub_nilfs2_dat_entry struct grub_nilfs2_dat_entry
{ {
@ -311,10 +313,12 @@ grub_nilfs2_palloc_group (struct grub_nilfs2_data *data,
} }
static inline grub_uint32_t static inline grub_uint32_t
grub_nilfs2_palloc_groups_per_desc_block (struct grub_nilfs2_data *data) grub_nilfs2_palloc_log_groups_per_desc_block (struct grub_nilfs2_data *data)
{ {
return NILFS2_BLOCK_SIZE (data) / return LOG2_BLOCK_SIZE (data) - LOG_SIZE_GROUP_DESC;
sizeof (struct grub_nilfs2_palloc_group_desc);
COMPILE_TIME_ASSERT (sizeof (struct grub_nilfs2_palloc_group_desc)
== (1 << LOG_SIZE_GROUP_DESC));
} }
static inline grub_uint32_t static inline grub_uint32_t
@ -338,8 +342,8 @@ static inline grub_uint32_t
grub_nilfs2_blocks_per_desc_block_log (struct grub_nilfs2_data *data, grub_nilfs2_blocks_per_desc_block_log (struct grub_nilfs2_data *data,
unsigned long log_entry_size) unsigned long log_entry_size)
{ {
return grub_nilfs2_palloc_groups_per_desc_block (data) * return(grub_nilfs2_blocks_per_group_log (data, log_entry_size)
grub_nilfs2_blocks_per_group_log (data, log_entry_size) + 1; << grub_nilfs2_palloc_log_groups_per_desc_block (data)) + 1;
} }
static inline grub_uint32_t static inline grub_uint32_t
@ -348,7 +352,7 @@ grub_nilfs2_palloc_desc_block_offset_log (struct grub_nilfs2_data *data,
unsigned long log_entry_size) unsigned long log_entry_size)
{ {
grub_uint32_t desc_block = grub_uint32_t desc_block =
group / grub_nilfs2_palloc_groups_per_desc_block (data); group >> grub_nilfs2_palloc_log_groups_per_desc_block (data);
return desc_block * grub_nilfs2_blocks_per_desc_block_log (data, return desc_block * grub_nilfs2_blocks_per_desc_block_log (data,
log_entry_size); log_entry_size);
} }
@ -358,8 +362,8 @@ grub_nilfs2_palloc_bitmap_block_offset (struct grub_nilfs2_data *data,
unsigned long group, unsigned long group,
unsigned long log_entry_size) unsigned long log_entry_size)
{ {
unsigned long desc_offset = group % unsigned long desc_offset = group
grub_nilfs2_palloc_groups_per_desc_block (data); & ((1 << grub_nilfs2_palloc_log_groups_per_desc_block (data)) - 1);
return grub_nilfs2_palloc_desc_block_offset_log (data, group, log_entry_size) return grub_nilfs2_palloc_desc_block_offset_log (data, group, log_entry_size)
+ 1 + 1