Skip to content

Commit 5fc7b14

Browse files
koniskonis
committed
nilfs2: use mark_buffer_dirty to mark btnode or meta data dirty
This replaces nilfs_mdt_mark_buffer_dirty and nilfs_btnode_mark_dirty macros with mark_buffer_dirty and gets rid of nilfs_mark_buffer_dirty, an own mark buffer dirty function. Signed-off-by: Ryusuke Konishi <[email protected]>
1 parent aa405b1 commit 5fc7b14

File tree

15 files changed

+63
-86
lines changed

15 files changed

+63
-86
lines changed

‎fs/nilfs2/alloc.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ int nilfs_palloc_prepare_alloc_entry(struct inode *inode,
489489
void nilfs_palloc_commit_alloc_entry(struct inode *inode,
490490
struct nilfs_palloc_req *req)
491491
{
492-
nilfs_mdt_mark_buffer_dirty(req->pr_bitmap_bh);
493-
nilfs_mdt_mark_buffer_dirty(req->pr_desc_bh);
492+
mark_buffer_dirty(req->pr_bitmap_bh);
493+
mark_buffer_dirty(req->pr_desc_bh);
494494
nilfs_mdt_mark_dirty(inode);
495495

496496
brelse(req->pr_bitmap_bh);
@@ -527,8 +527,8 @@ void nilfs_palloc_commit_free_entry(struct inode *inode,
527527
kunmap(req->pr_bitmap_bh->b_page);
528528
kunmap(req->pr_desc_bh->b_page);
529529

530-
nilfs_mdt_mark_buffer_dirty(req->pr_desc_bh);
531-
nilfs_mdt_mark_buffer_dirty(req->pr_bitmap_bh);
530+
mark_buffer_dirty(req->pr_desc_bh);
531+
mark_buffer_dirty(req->pr_bitmap_bh);
532532
nilfs_mdt_mark_dirty(inode);
533533

534534
brelse(req->pr_bitmap_bh);
@@ -683,8 +683,8 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)
683683
kunmap(bitmap_bh->b_page);
684684
kunmap(desc_bh->b_page);
685685

686-
nilfs_mdt_mark_buffer_dirty(desc_bh);
687-
nilfs_mdt_mark_buffer_dirty(bitmap_bh);
686+
mark_buffer_dirty(desc_bh);
687+
mark_buffer_dirty(bitmap_bh);
688688
nilfs_mdt_mark_dirty(inode);
689689

690690
brelse(bitmap_bh);

‎fs/nilfs2/btnode.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc,
254254
"invalid oldkey %lld (newkey=%lld)",
255255
(unsigned long long)oldkey,
256256
(unsigned long long)newkey);
257-
nilfs_btnode_mark_dirty(obh);
257+
mark_buffer_dirty(obh);
258258

259259
spin_lock_irq(&btnc->tree_lock);
260260
radix_tree_delete(&btnc->page_tree, oldkey);
@@ -266,7 +266,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc,
266266
unlock_page(opage);
267267
} else {
268268
nilfs_copy_buffer(nbh, obh);
269-
nilfs_btnode_mark_dirty(nbh);
269+
mark_buffer_dirty(nbh);
270270

271271
nbh->b_blocknr = newkey;
272272
ctxt->bh = nbh;

‎fs/nilfs2/btnode.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,4 @@ void nilfs_btnode_commit_change_key(struct address_space *,
5050
void nilfs_btnode_abort_change_key(struct address_space *,
5151
struct nilfs_btnode_chkey_ctxt *);
5252

53-
#define nilfs_btnode_mark_dirty(bh) nilfs_mark_buffer_dirty(bh)
54-
55-
5653
#endif /* _NILFS_BTNODE_H */

‎fs/nilfs2/btree.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ static void nilfs_btree_promote_key(struct nilfs_bmap *btree,
714714
nilfs_btree_get_nonroot_node(path, level),
715715
path[level].bp_index, key);
716716
if (!buffer_dirty(path[level].bp_bh))
717-
nilfs_btnode_mark_dirty(path[level].bp_bh);
717+
mark_buffer_dirty(path[level].bp_bh);
718718
} while ((path[level].bp_index == 0) &&
719719
(++level < nilfs_btree_height(btree) - 1));
720720
}
@@ -739,7 +739,7 @@ static void nilfs_btree_do_insert(struct nilfs_bmap *btree,
739739
nilfs_btree_node_insert(node, path[level].bp_index,
740740
*keyp, *ptrp, ncblk);
741741
if (!buffer_dirty(path[level].bp_bh))
742-
nilfs_btnode_mark_dirty(path[level].bp_bh);
742+
mark_buffer_dirty(path[level].bp_bh);
743743

744744
if (path[level].bp_index == 0)
745745
nilfs_btree_promote_key(btree, path, level + 1,
@@ -777,9 +777,9 @@ static void nilfs_btree_carry_left(struct nilfs_bmap *btree,
777777
nilfs_btree_node_move_left(left, node, n, ncblk, ncblk);
778778

779779
if (!buffer_dirty(path[level].bp_bh))
780-
nilfs_btnode_mark_dirty(path[level].bp_bh);
780+
mark_buffer_dirty(path[level].bp_bh);
781781
if (!buffer_dirty(path[level].bp_sib_bh))
782-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
782+
mark_buffer_dirty(path[level].bp_sib_bh);
783783

784784
nilfs_btree_promote_key(btree, path, level + 1,
785785
nilfs_btree_node_get_key(node, 0));
@@ -823,9 +823,9 @@ static void nilfs_btree_carry_right(struct nilfs_bmap *btree,
823823
nilfs_btree_node_move_right(node, right, n, ncblk, ncblk);
824824

825825
if (!buffer_dirty(path[level].bp_bh))
826-
nilfs_btnode_mark_dirty(path[level].bp_bh);
826+
mark_buffer_dirty(path[level].bp_bh);
827827
if (!buffer_dirty(path[level].bp_sib_bh))
828-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
828+
mark_buffer_dirty(path[level].bp_sib_bh);
829829

830830
path[level + 1].bp_index++;
831831
nilfs_btree_promote_key(btree, path, level + 1,
@@ -870,9 +870,9 @@ static void nilfs_btree_split(struct nilfs_bmap *btree,
870870
nilfs_btree_node_move_right(node, right, n, ncblk, ncblk);
871871

872872
if (!buffer_dirty(path[level].bp_bh))
873-
nilfs_btnode_mark_dirty(path[level].bp_bh);
873+
mark_buffer_dirty(path[level].bp_bh);
874874
if (!buffer_dirty(path[level].bp_sib_bh))
875-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
875+
mark_buffer_dirty(path[level].bp_sib_bh);
876876

877877
newkey = nilfs_btree_node_get_key(right, 0);
878878
newptr = path[level].bp_newreq.bpr_ptr;
@@ -919,7 +919,7 @@ static void nilfs_btree_grow(struct nilfs_bmap *btree,
919919
nilfs_btree_node_set_level(root, level + 1);
920920

921921
if (!buffer_dirty(path[level].bp_sib_bh))
922-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
922+
mark_buffer_dirty(path[level].bp_sib_bh);
923923

924924
path[level].bp_bh = path[level].bp_sib_bh;
925925
path[level].bp_sib_bh = NULL;
@@ -1194,7 +1194,7 @@ static void nilfs_btree_do_delete(struct nilfs_bmap *btree,
11941194
nilfs_btree_node_delete(node, path[level].bp_index,
11951195
keyp, ptrp, ncblk);
11961196
if (!buffer_dirty(path[level].bp_bh))
1197-
nilfs_btnode_mark_dirty(path[level].bp_bh);
1197+
mark_buffer_dirty(path[level].bp_bh);
11981198
if (path[level].bp_index == 0)
11991199
nilfs_btree_promote_key(btree, path, level + 1,
12001200
nilfs_btree_node_get_key(node, 0));
@@ -1226,9 +1226,9 @@ static void nilfs_btree_borrow_left(struct nilfs_bmap *btree,
12261226
nilfs_btree_node_move_right(left, node, n, ncblk, ncblk);
12271227

12281228
if (!buffer_dirty(path[level].bp_bh))
1229-
nilfs_btnode_mark_dirty(path[level].bp_bh);
1229+
mark_buffer_dirty(path[level].bp_bh);
12301230
if (!buffer_dirty(path[level].bp_sib_bh))
1231-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
1231+
mark_buffer_dirty(path[level].bp_sib_bh);
12321232

12331233
nilfs_btree_promote_key(btree, path, level + 1,
12341234
nilfs_btree_node_get_key(node, 0));
@@ -1258,9 +1258,9 @@ static void nilfs_btree_borrow_right(struct nilfs_bmap *btree,
12581258
nilfs_btree_node_move_left(node, right, n, ncblk, ncblk);
12591259

12601260
if (!buffer_dirty(path[level].bp_bh))
1261-
nilfs_btnode_mark_dirty(path[level].bp_bh);
1261+
mark_buffer_dirty(path[level].bp_bh);
12621262
if (!buffer_dirty(path[level].bp_sib_bh))
1263-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
1263+
mark_buffer_dirty(path[level].bp_sib_bh);
12641264

12651265
path[level + 1].bp_index++;
12661266
nilfs_btree_promote_key(btree, path, level + 1,
@@ -1289,7 +1289,7 @@ static void nilfs_btree_concat_left(struct nilfs_bmap *btree,
12891289
nilfs_btree_node_move_left(left, node, n, ncblk, ncblk);
12901290

12911291
if (!buffer_dirty(path[level].bp_sib_bh))
1292-
nilfs_btnode_mark_dirty(path[level].bp_sib_bh);
1292+
mark_buffer_dirty(path[level].bp_sib_bh);
12931293

12941294
nilfs_btnode_delete(path[level].bp_bh);
12951295
path[level].bp_bh = path[level].bp_sib_bh;
@@ -1315,7 +1315,7 @@ static void nilfs_btree_concat_right(struct nilfs_bmap *btree,
13151315
nilfs_btree_node_move_left(node, right, n, ncblk, ncblk);
13161316

13171317
if (!buffer_dirty(path[level].bp_bh))
1318-
nilfs_btnode_mark_dirty(path[level].bp_bh);
1318+
mark_buffer_dirty(path[level].bp_bh);
13191319

13201320
nilfs_btnode_delete(path[level].bp_sib_bh);
13211321
path[level].bp_sib_bh = NULL;
@@ -1709,7 +1709,7 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *btree,
17091709
nilfs_btree_node_init(node, 0, 1, n, ncblk, keys, ptrs);
17101710
nilfs_btree_node_insert(node, n, key, dreq->bpr_ptr, ncblk);
17111711
if (!buffer_dirty(bh))
1712-
nilfs_btnode_mark_dirty(bh);
1712+
mark_buffer_dirty(bh);
17131713
if (!nilfs_bmap_dirty(btree))
17141714
nilfs_bmap_set_dirty(btree);
17151715

@@ -1787,7 +1787,7 @@ static int nilfs_btree_propagate_p(struct nilfs_bmap *btree,
17871787
{
17881788
while ((++level < nilfs_btree_height(btree) - 1) &&
17891789
!buffer_dirty(path[level].bp_bh))
1790-
nilfs_btnode_mark_dirty(path[level].bp_bh);
1790+
mark_buffer_dirty(path[level].bp_bh);
17911791

17921792
return 0;
17931793
}
@@ -2229,7 +2229,7 @@ static int nilfs_btree_mark(struct nilfs_bmap *btree, __u64 key, int level)
22292229
}
22302230

22312231
if (!buffer_dirty(bh))
2232-
nilfs_btnode_mark_dirty(bh);
2232+
mark_buffer_dirty(bh);
22332233
brelse(bh);
22342234
if (!nilfs_bmap_dirty(btree))
22352235
nilfs_bmap_set_dirty(btree);

‎fs/nilfs2/cpfile.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@ int nilfs_cpfile_get_checkpoint(struct inode *cpfile,
216216
if (!nilfs_cpfile_is_in_first(cpfile, cno))
217217
nilfs_cpfile_block_add_valid_checkpoints(cpfile, cp_bh,
218218
kaddr, 1);
219-
nilfs_mdt_mark_buffer_dirty(cp_bh);
219+
mark_buffer_dirty(cp_bh);
220220

221221
kaddr = kmap_atomic(header_bh->b_page, KM_USER0);
222222
header = nilfs_cpfile_block_get_header(cpfile, header_bh,
223223
kaddr);
224224
le64_add_cpu(&header->ch_ncheckpoints, 1);
225225
kunmap_atomic(kaddr, KM_USER0);
226-
nilfs_mdt_mark_buffer_dirty(header_bh);
226+
mark_buffer_dirty(header_bh);
227227
nilfs_mdt_mark_dirty(cpfile);
228228
}
229229

@@ -326,7 +326,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
326326
}
327327
if (nicps > 0) {
328328
tnicps += nicps;
329-
nilfs_mdt_mark_buffer_dirty(cp_bh);
329+
mark_buffer_dirty(cp_bh);
330330
nilfs_mdt_mark_dirty(cpfile);
331331
if (!nilfs_cpfile_is_in_first(cpfile, cno)) {
332332
count =
@@ -358,7 +358,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
358358
header = nilfs_cpfile_block_get_header(cpfile, header_bh,
359359
kaddr);
360360
le64_add_cpu(&header->ch_ncheckpoints, -(u64)tnicps);
361-
nilfs_mdt_mark_buffer_dirty(header_bh);
361+
mark_buffer_dirty(header_bh);
362362
nilfs_mdt_mark_dirty(cpfile);
363363
kunmap_atomic(kaddr, KM_USER0);
364364
}
@@ -671,10 +671,10 @@ static int nilfs_cpfile_set_snapshot(struct inode *cpfile, __u64 cno)
671671
le64_add_cpu(&header->ch_nsnapshots, 1);
672672
kunmap_atomic(kaddr, KM_USER0);
673673

674-
nilfs_mdt_mark_buffer_dirty(prev_bh);
675-
nilfs_mdt_mark_buffer_dirty(curr_bh);
676-
nilfs_mdt_mark_buffer_dirty(cp_bh);
677-
nilfs_mdt_mark_buffer_dirty(header_bh);
674+
mark_buffer_dirty(prev_bh);
675+
mark_buffer_dirty(curr_bh);
676+
mark_buffer_dirty(cp_bh);
677+
mark_buffer_dirty(header_bh);
678678
nilfs_mdt_mark_dirty(cpfile);
679679

680680
brelse(prev_bh);
@@ -774,10 +774,10 @@ static int nilfs_cpfile_clear_snapshot(struct inode *cpfile, __u64 cno)
774774
le64_add_cpu(&header->ch_nsnapshots, -1);
775775
kunmap_atomic(kaddr, KM_USER0);
776776

777-
nilfs_mdt_mark_buffer_dirty(next_bh);
778-
nilfs_mdt_mark_buffer_dirty(prev_bh);
779-
nilfs_mdt_mark_buffer_dirty(cp_bh);
780-
nilfs_mdt_mark_buffer_dirty(header_bh);
777+
mark_buffer_dirty(next_bh);
778+
mark_buffer_dirty(prev_bh);
779+
mark_buffer_dirty(cp_bh);
780+
mark_buffer_dirty(header_bh);
781781
nilfs_mdt_mark_dirty(cpfile);
782782

783783
brelse(prev_bh);

‎fs/nilfs2/dat.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static int nilfs_dat_prepare_entry(struct inode *dat,
5454
static void nilfs_dat_commit_entry(struct inode *dat,
5555
struct nilfs_palloc_req *req)
5656
{
57-
nilfs_mdt_mark_buffer_dirty(req->pr_entry_bh);
57+
mark_buffer_dirty(req->pr_entry_bh);
5858
nilfs_mdt_mark_dirty(dat);
5959
brelse(req->pr_entry_bh);
6060
}
@@ -361,7 +361,7 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr)
361361
entry->de_blocknr = cpu_to_le64(blocknr);
362362
kunmap_atomic(kaddr, KM_USER0);
363363

364-
nilfs_mdt_mark_buffer_dirty(entry_bh);
364+
mark_buffer_dirty(entry_bh);
365365
nilfs_mdt_mark_dirty(dat);
366366

367367
brelse(entry_bh);

‎fs/nilfs2/gcinode.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,11 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_head *bh)
157157
if (buffer_dirty(bh))
158158
return -EEXIST;
159159

160-
if (buffer_nilfs_node(bh)) {
161-
if (nilfs_btree_broken_node_block(bh)) {
162-
clear_buffer_uptodate(bh);
163-
return -EIO;
164-
}
165-
nilfs_btnode_mark_dirty(bh);
166-
} else {
167-
nilfs_mark_buffer_dirty(bh);
160+
if (buffer_nilfs_node(bh) && nilfs_btree_broken_node_block(bh)) {
161+
clear_buffer_uptodate(bh);
162+
return -EIO;
168163
}
164+
mark_buffer_dirty(bh);
169165
return 0;
170166
}
171167

‎fs/nilfs2/ifile.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int nilfs_ifile_create_inode(struct inode *ifile, ino_t *out_ino,
8080
return ret;
8181
}
8282
nilfs_palloc_commit_alloc_entry(ifile, &req);
83-
nilfs_mdt_mark_buffer_dirty(req.pr_entry_bh);
83+
mark_buffer_dirty(req.pr_entry_bh);
8484
nilfs_mdt_mark_dirty(ifile);
8585
*out_ino = (ino_t)req.pr_entry_nr;
8686
*out_bh = req.pr_entry_bh;
@@ -128,7 +128,7 @@ int nilfs_ifile_delete_inode(struct inode *ifile, ino_t ino)
128128
raw_inode->i_flags = 0;
129129
kunmap_atomic(kaddr, KM_USER0);
130130

131-
nilfs_mdt_mark_buffer_dirty(req.pr_entry_bh);
131+
mark_buffer_dirty(req.pr_entry_bh);
132132
brelse(req.pr_entry_bh);
133133

134134
nilfs_palloc_commit_free_entry(ifile, &req);

‎fs/nilfs2/inode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ int nilfs_mark_inode_dirty(struct inode *inode)
901901
return err;
902902
}
903903
nilfs_update_inode(inode, ibh);
904-
nilfs_mdt_mark_buffer_dirty(ibh);
904+
mark_buffer_dirty(ibh);
905905
nilfs_mdt_mark_dirty(NILFS_I(inode)->i_root->ifile);
906906
brelse(ibh);
907907
return 0;

‎fs/nilfs2/mdt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ nilfs_mdt_insert_new_block(struct inode *inode, unsigned long block,
6666
kunmap_atomic(kaddr, KM_USER0);
6767

6868
set_buffer_uptodate(bh);
69-
nilfs_mark_buffer_dirty(bh);
69+
mark_buffer_dirty(bh);
7070
nilfs_mdt_mark_dirty(inode);
7171
return 0;
7272
}
@@ -355,7 +355,7 @@ int nilfs_mdt_mark_block_dirty(struct inode *inode, unsigned long block)
355355
err = nilfs_mdt_read_block(inode, block, 0, &bh);
356356
if (unlikely(err))
357357
return err;
358-
nilfs_mark_buffer_dirty(bh);
358+
mark_buffer_dirty(bh);
359359
nilfs_mdt_mark_dirty(inode);
360360
brelse(bh);
361361
return 0;

0 commit comments

Comments
 (0)