Skip to content

Commit 5a15907

Browse files
author
Andreas Gruenbacher
committed
gfs2: Get rid of gfs2_log_[un]lock helpers
These two helpers only hide the locking operation; they do not make the code more readable. Created with: sed -i -e 's:gfs2_log_unlock(sdp):spin_unlock(\&sdp->sd_log_lock):' \ -e 's:gfs2_log_lock(sdp):spin_lock(\&sdp->sd_log_lock):' Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
1 parent 7288185 commit 5a15907

7 files changed

Lines changed: 37 additions & 61 deletions

File tree

‎fs/gfs2/aops.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh)
583583
struct gfs2_bufdata *bd;
584584

585585
lock_buffer(bh);
586-
gfs2_log_lock(sdp);
586+
spin_lock(&sdp->sd_log_lock);
587587
clear_buffer_dirty(bh);
588588
bd = bh->b_private;
589589
if (bd) {
@@ -599,7 +599,7 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh)
599599
clear_buffer_mapped(bh);
600600
clear_buffer_req(bh);
601601
clear_buffer_new(bh);
602-
gfs2_log_unlock(sdp);
602+
spin_unlock(&sdp->sd_log_lock);
603603
unlock_buffer(bh);
604604
}
605605

@@ -667,7 +667,7 @@ bool gfs2_release_folio(struct folio *folio, gfp_t gfp_mask)
667667
* again.
668668
*/
669669

670-
gfs2_log_lock(sdp);
670+
spin_lock(&sdp->sd_log_lock);
671671
bh = head;
672672
do {
673673
if (atomic_read(&bh->b_count))
@@ -699,12 +699,12 @@ bool gfs2_release_folio(struct folio *folio, gfp_t gfp_mask)
699699

700700
bh = bh->b_this_page;
701701
} while (bh != head);
702-
gfs2_log_unlock(sdp);
702+
spin_unlock(&sdp->sd_log_lock);
703703

704704
return try_to_free_buffers(folio);
705705

706706
cannot_release:
707-
gfs2_log_unlock(sdp);
707+
spin_unlock(&sdp->sd_log_lock);
708708
return false;
709709
}
710710

‎fs/gfs2/glops.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,
6464
struct buffer_head *bh;
6565
const unsigned long b_state = (1UL << BH_Dirty)|(1UL << BH_Pinned)|(1UL << BH_Lock);
6666

67-
gfs2_log_lock(sdp);
67+
spin_lock(&sdp->sd_log_lock);
6868
spin_lock(&sdp->sd_ail_lock);
6969
list_for_each_entry_safe_reverse(bd, tmp, head, bd_ail_gl_list) {
7070
if (nr_revokes == 0)
@@ -80,7 +80,7 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,
8080
}
8181
GLOCK_BUG_ON(gl, !fsync && atomic_read(&gl->gl_ail_count));
8282
spin_unlock(&sdp->sd_ail_lock);
83-
gfs2_log_unlock(sdp);
83+
spin_unlock(&sdp->sd_log_lock);
8484
}
8585

8686

@@ -109,10 +109,10 @@ static int gfs2_ail_empty_gl(struct gfs2_glock *gl)
109109
* If none of these conditions are true, our revokes are all
110110
* flushed and we can return.
111111
*/
112-
gfs2_log_lock(sdp);
112+
spin_lock(&sdp->sd_log_lock);
113113
have_revokes = !list_empty(&sdp->sd_log_revokes);
114114
log_in_flight = atomic_read(&sdp->sd_log_in_flight);
115-
gfs2_log_unlock(sdp);
115+
spin_unlock(&sdp->sd_log_lock);
116116
if (have_revokes)
117117
goto flush;
118118
if (log_in_flight)

‎fs/gfs2/log.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -800,9 +800,9 @@ void gfs2_flush_revokes(struct gfs2_sbd *sdp)
800800
/* number of revokes we still have room for */
801801
unsigned int max_revokes = atomic_read(&sdp->sd_log_revokes_available);
802802

803-
gfs2_log_lock(sdp);
803+
spin_lock(&sdp->sd_log_lock);
804804
gfs2_ail1_empty(sdp, max_revokes);
805-
gfs2_log_unlock(sdp);
805+
spin_unlock(&sdp->sd_log_lock);
806806
}
807807

808808
/**
@@ -1110,7 +1110,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)
11101110
goto out_withdraw;
11111111
lops_after_commit(sdp, tr);
11121112

1113-
gfs2_log_lock(sdp);
1113+
spin_lock(&sdp->sd_log_lock);
11141114
sdp->sd_log_blks_reserved = 0;
11151115

11161116
spin_lock(&sdp->sd_ail_lock);
@@ -1119,7 +1119,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)
11191119
tr = NULL;
11201120
}
11211121
spin_unlock(&sdp->sd_ail_lock);
1122-
gfs2_log_unlock(sdp);
1122+
spin_unlock(&sdp->sd_log_lock);
11231123

11241124
if (!(flags & GFS2_LOG_HEAD_FLUSH_NORMAL)) {
11251125
if (!sdp->sd_log_idle) {
@@ -1200,7 +1200,7 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
12001200
unsigned int unused;
12011201
unsigned int maxres;
12021202

1203-
gfs2_log_lock(sdp);
1203+
spin_lock(&sdp->sd_log_lock);
12041204

12051205
if (sdp->sd_log_tr) {
12061206
gfs2_merge_trans(sdp, tr);
@@ -1218,7 +1218,7 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
12181218
gfs2_log_release(sdp, unused);
12191219
sdp->sd_log_blks_reserved = reserved;
12201220

1221-
gfs2_log_unlock(sdp);
1221+
spin_unlock(&sdp->sd_log_lock);
12221222
}
12231223

12241224
static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp)

‎fs/gfs2/log.h‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,6 @@
2020
*/
2121
#define GFS2_LOG_FLUSH_MIN_BLOCKS 4
2222

23-
/**
24-
* gfs2_log_lock - acquire the right to mess with the log manager
25-
* @sdp: the filesystem
26-
*
27-
*/
28-
29-
static inline void gfs2_log_lock(struct gfs2_sbd *sdp)
30-
__acquires(&sdp->sd_log_lock)
31-
{
32-
spin_lock(&sdp->sd_log_lock);
33-
}
34-
35-
/**
36-
* gfs2_log_unlock - release the right to mess with the log manager
37-
* @sdp: the filesystem
38-
*
39-
*/
40-
41-
static inline void gfs2_log_unlock(struct gfs2_sbd *sdp)
42-
__releases(&sdp->sd_log_lock)
43-
{
44-
spin_unlock(&sdp->sd_log_lock);
45-
}
46-
4723
static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip)
4824
{
4925
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

‎fs/gfs2/lops.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,19 +648,19 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit,
648648
unsigned n;
649649
__be64 *ptr;
650650

651-
gfs2_log_lock(sdp);
651+
spin_lock(&sdp->sd_log_lock);
652652
list_sort(NULL, blist, blocknr_cmp);
653653
bd1 = bd2 = list_prepare_entry(bd1, blist, bd_list);
654654
while(total) {
655655
num = total;
656656
if (total > limit)
657657
num = limit;
658-
gfs2_log_unlock(sdp);
658+
spin_unlock(&sdp->sd_log_lock);
659659
page = gfs2_get_log_desc(sdp,
660660
is_databuf ? GFS2_LOG_DESC_JDATA :
661661
GFS2_LOG_DESC_METADATA, num + 1, num);
662662
ld = page_address(page);
663-
gfs2_log_lock(sdp);
663+
spin_lock(&sdp->sd_log_lock);
664664
ptr = (__be64 *)(ld + 1);
665665

666666
n = 0;
@@ -674,14 +674,14 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit,
674674
break;
675675
}
676676

677-
gfs2_log_unlock(sdp);
677+
spin_unlock(&sdp->sd_log_lock);
678678
gfs2_log_write_page(sdp, page);
679-
gfs2_log_lock(sdp);
679+
spin_lock(&sdp->sd_log_lock);
680680

681681
n = 0;
682682
list_for_each_entry_continue(bd2, blist, bd_list) {
683683
get_bh(bd2->bd_bh);
684-
gfs2_log_unlock(sdp);
684+
spin_unlock(&sdp->sd_log_lock);
685685
lock_buffer(bd2->bd_bh);
686686

687687
if (buffer_escaped(bd2->bd_bh)) {
@@ -698,15 +698,15 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit,
698698
} else {
699699
gfs2_log_write_bh(sdp, bd2->bd_bh);
700700
}
701-
gfs2_log_lock(sdp);
701+
spin_lock(&sdp->sd_log_lock);
702702
if (++n >= num)
703703
break;
704704
}
705705

706706
BUG_ON(total < num);
707707
total -= num;
708708
}
709-
gfs2_log_unlock(sdp);
709+
spin_unlock(&sdp->sd_log_lock);
710710
}
711711

712712
static void buf_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

‎fs/gfs2/meta_io.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static void gfs2_ail1_wipe(struct gfs2_sbd *sdp, u64 bstart, u32 blen)
391391
struct buffer_head *bh;
392392
u64 end = bstart + blen;
393393

394-
gfs2_log_lock(sdp);
394+
spin_lock(&sdp->sd_log_lock);
395395
spin_lock(&sdp->sd_ail_lock);
396396
list_for_each_entry_safe(tr, s, &sdp->sd_ail1_list, tr_list) {
397397
list_for_each_entry_safe(bd, bs, &tr->tr_ail1_list,
@@ -404,7 +404,7 @@ static void gfs2_ail1_wipe(struct gfs2_sbd *sdp, u64 bstart, u32 blen)
404404
}
405405
}
406406
spin_unlock(&sdp->sd_ail_lock);
407-
gfs2_log_unlock(sdp);
407+
spin_unlock(&sdp->sd_log_lock);
408408
}
409409

410410
static struct buffer_head *gfs2_getjdatabuf(struct gfs2_inode *ip, u64 blkno)
@@ -456,11 +456,11 @@ void gfs2_journal_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen)
456456
}
457457
if (bh) {
458458
lock_buffer(bh);
459-
gfs2_log_lock(sdp);
459+
spin_lock(&sdp->sd_log_lock);
460460
spin_lock(&sdp->sd_ail_lock);
461461
gfs2_remove_from_journal(bh, ty);
462462
spin_unlock(&sdp->sd_ail_lock);
463-
gfs2_log_unlock(sdp);
463+
spin_unlock(&sdp->sd_log_lock);
464464
unlock_buffer(bh);
465465
brelse(bh);
466466
}

‎fs/gfs2/trans.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,17 +205,17 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
205205
set_bit(TR_TOUCHED, &tr->tr_flags);
206206
goto out;
207207
}
208-
gfs2_log_lock(sdp);
208+
spin_lock(&sdp->sd_log_lock);
209209
bd = bh->b_private;
210210
if (bd == NULL) {
211-
gfs2_log_unlock(sdp);
211+
spin_unlock(&sdp->sd_log_lock);
212212
unlock_buffer(bh);
213213
if (bh->b_private == NULL)
214214
bd = gfs2_alloc_bufdata(gl, bh);
215215
else
216216
bd = bh->b_private;
217217
lock_buffer(bh);
218-
gfs2_log_lock(sdp);
218+
spin_lock(&sdp->sd_log_lock);
219219
}
220220
gfs2_assert(sdp, bd->bd_gl == gl);
221221
set_bit(TR_TOUCHED, &tr->tr_flags);
@@ -226,7 +226,7 @@ void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh)
226226
tr->tr_num_databuf_new++;
227227
list_add_tail(&bd->bd_list, &tr->tr_databuf);
228228
}
229-
gfs2_log_unlock(sdp);
229+
spin_unlock(&sdp->sd_log_lock);
230230
out:
231231
unlock_buffer(bh);
232232
}
@@ -266,10 +266,10 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
266266
set_bit(TR_TOUCHED, &tr->tr_flags);
267267
goto out;
268268
}
269-
gfs2_log_lock(sdp);
269+
spin_lock(&sdp->sd_log_lock);
270270
bd = bh->b_private;
271271
if (bd == NULL) {
272-
gfs2_log_unlock(sdp);
272+
spin_unlock(&sdp->sd_log_lock);
273273
unlock_buffer(bh);
274274
folio_lock(bh->b_folio);
275275
if (bh->b_private == NULL)
@@ -278,7 +278,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
278278
bd = bh->b_private;
279279
folio_unlock(bh->b_folio);
280280
lock_buffer(bh);
281-
gfs2_log_lock(sdp);
281+
spin_lock(&sdp->sd_log_lock);
282282
}
283283
gfs2_assert(sdp, bd->bd_gl == gl);
284284
set_bit(TR_TOUCHED, &tr->tr_flags);
@@ -309,7 +309,7 @@ void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh)
309309
list_add(&bd->bd_list, &tr->tr_buf);
310310
tr->tr_num_buf_new++;
311311
out_unlock:
312-
gfs2_log_unlock(sdp);
312+
spin_unlock(&sdp->sd_log_lock);
313313
out:
314314
unlock_buffer(bh);
315315
}
@@ -329,7 +329,7 @@ void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
329329
struct gfs2_bufdata *bd, *tmp;
330330
unsigned int n = len;
331331

332-
gfs2_log_lock(sdp);
332+
spin_lock(&sdp->sd_log_lock);
333333
list_for_each_entry_safe(bd, tmp, &sdp->sd_log_revokes, bd_list) {
334334
if ((bd->bd_blkno >= blkno) && (bd->bd_blkno < (blkno + len))) {
335335
list_del_init(&bd->bd_list);
@@ -343,7 +343,7 @@ void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
343343
break;
344344
}
345345
}
346-
gfs2_log_unlock(sdp);
346+
spin_unlock(&sdp->sd_log_lock);
347347
}
348348

349349
void gfs2_trans_free(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

0 commit comments

Comments
 (0)