p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename all ref_count to refs in struct 

refs is better than ref_count to record a struct's ref count.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Suggested-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Zhao Lei 2015-01-20 15:11:45 +08:00 committed by Chris Mason
parent ffe2d2034b
commit 570193454a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/scrub.c
View File

@ -79,7 +79,7 @@ struct scrub_page {
u64 logical; u64 logical;
u64 physical; u64 physical;
u64 physical_for_dev_replace; u64 physical_for_dev_replace;
atomic_t ref_count; atomic_t refs;
struct { struct {
unsigned int mirror_num:8; unsigned int mirror_num:8;
unsigned int have_csum:1; unsigned int have_csum:1;
@ -112,7 +112,7 @@ struct scrub_block {
struct scrub_page *pagev[SCRUB_MAX_PAGES_PER_BLOCK]; struct scrub_page *pagev[SCRUB_MAX_PAGES_PER_BLOCK];
int page_count; int page_count;
atomic_t outstanding_pages; atomic_t outstanding_pages;
atomic_t ref_count; /* free mem on transition to zero */ atomic_t refs; /* free mem on transition to zero */
struct scrub_ctx *sctx; struct scrub_ctx *sctx;
struct scrub_parity *sparity; struct scrub_parity *sparity;
struct { struct {
@ -141,7 +141,7 @@ struct scrub_parity {
int stripe_len; int stripe_len;
atomic_t ref_count; atomic_t refs;
struct list_head spages; struct list_head spages;
@ -1313,7 +1313,7 @@ static int scrub_setup_recheck_block(struct scrub_block *original_sblock,
int ret; int ret;
/* /*
* note: the two members ref_count and outstanding_pages * note: the two members refs and outstanding_pages
* are not used (and not set) in the blocks that are used for * are not used (and not set) in the blocks that are used for
* the recheck procedure * the recheck procedure
*/ */
@ -2026,12 +2026,12 @@ static int scrub_checksum_super(struct scrub_block *sblock)
static void scrub_block_get(struct scrub_block *sblock) static void scrub_block_get(struct scrub_block *sblock)
{ {
atomic_inc(&sblock->ref_count); atomic_inc(&sblock->refs);
} }
static void scrub_block_put(struct scrub_block *sblock) static void scrub_block_put(struct scrub_block *sblock)
{ {
if (atomic_dec_and_test(&sblock->ref_count)) { if (atomic_dec_and_test(&sblock->refs)) {
int i; int i;
if (sblock->sparity) if (sblock->sparity)
@ -2045,12 +2045,12 @@ static void scrub_block_put(struct scrub_block *sblock)
static void scrub_page_get(struct scrub_page *spage) static void scrub_page_get(struct scrub_page *spage)
{ {
atomic_inc(&spage->ref_count); atomic_inc(&spage->refs);
} }
static void scrub_page_put(struct scrub_page *spage) static void scrub_page_put(struct scrub_page *spage)
{ {
if (atomic_dec_and_test(&spage->ref_count)) { if (atomic_dec_and_test(&spage->refs)) {
if (spage->page) if (spage->page)
__free_page(spage->page); __free_page(spage->page);
kfree(spage); kfree(spage);
@ -2176,7 +2176,7 @@ static int scrub_pages(struct scrub_ctx *sctx, u64 logical, u64 len,
/* one ref inside this function, plus one for each page added to /* one ref inside this function, plus one for each page added to
* a bio later on */ * a bio later on */
atomic_set(&sblock->ref_count, 1); atomic_set(&sblock->refs, 1);
sblock->sctx = sctx; sblock->sctx = sctx;
sblock->no_io_error_seen = 1; sblock->no_io_error_seen = 1;
@ -2469,7 +2469,7 @@ static int scrub_pages_for_parity(struct scrub_parity *sparity,
/* one ref inside this function, plus one for each page added to /* one ref inside this function, plus one for each page added to
* a bio later on */ * a bio later on */
atomic_set(&sblock->ref_count, 1); atomic_set(&sblock->refs, 1);
sblock->sctx = sctx; sblock->sctx = sctx;
sblock->no_io_error_seen = 1; sblock->no_io_error_seen = 1;
sblock->sparity = sparity; sblock->sparity = sparity;
@ -2721,12 +2721,12 @@ static inline int scrub_calc_parity_bitmap_len(int nsectors)
static void scrub_parity_get(struct scrub_parity *sparity) static void scrub_parity_get(struct scrub_parity *sparity)
{ {
atomic_inc(&sparity->ref_count); atomic_inc(&sparity->refs);
} }
static void scrub_parity_put(struct scrub_parity *sparity) static void scrub_parity_put(struct scrub_parity *sparity)
{ {
if (!atomic_dec_and_test(&sparity->ref_count)) if (!atomic_dec_and_test(&sparity->refs))
return; return;
scrub_parity_check_and_repair(sparity); scrub_parity_check_and_repair(sparity);
@ -2776,7 +2776,7 @@ static noinline_for_stack int scrub_raid56_parity(struct scrub_ctx *sctx,
sparity->scrub_dev = sdev; sparity->scrub_dev = sdev;
sparity->logic_start = logic_start; sparity->logic_start = logic_start;
sparity->logic_end = logic_end; sparity->logic_end = logic_end;
atomic_set(&sparity->ref_count, 1); atomic_set(&sparity->refs, 1);
INIT_LIST_HEAD(&sparity->spages); INIT_LIST_HEAD(&sparity->spages);
sparity->dbitmap = sparity->bitmap; sparity->dbitmap = sparity->bitmap;
sparity->ebitmap = (void *)sparity->bitmap + bitmap_len; sparity->ebitmap = (void *)sparity->bitmap + bitmap_len;