Skip to content

Commit 703a4af

Browse files
author
Andreas Gruenbacher
committed
gfs2: Move gfs2_log_pointers_init
Move gfs2_log_pointers_init to recovery.c: there is no need for inlining this function. Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 9179397 commit 703a4af

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

fs/gfs2/log.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,6 @@ __releases(&sdp->sd_log_lock)
4444
spin_unlock(&sdp->sd_log_lock);
4545
}
4646

47-
static inline void gfs2_log_pointers_init(struct gfs2_sbd *sdp,
48-
unsigned int value)
49-
{
50-
if (++value == sdp->sd_jdesc->jd_blocks) {
51-
value = 0;
52-
}
53-
sdp->sd_log_tail = value;
54-
sdp->sd_log_flush_tail = value;
55-
sdp->sd_log_head = value;
56-
}
57-
5847
static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip)
5948
{
6049
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

fs/gfs2/recovery.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,3 +581,12 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd, bool wait)
581581
return wait ? jd->jd_recover_error : 0;
582582
}
583583

584+
void gfs2_log_pointers_init(struct gfs2_sbd *sdp, unsigned int value)
585+
{
586+
if (++value == sdp->sd_jdesc->jd_blocks) {
587+
value = 0;
588+
}
589+
sdp->sd_log_tail = value;
590+
sdp->sd_log_flush_tail = value;
591+
sdp->sd_log_head = value;
592+
}

fs/gfs2/recovery.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ void gfs2_recover_func(struct work_struct *work);
2929
int __get_log_header(struct gfs2_sbd *sdp,
3030
const struct gfs2_log_header *lh, unsigned int blkno,
3131
struct gfs2_log_header_host *head);
32+
void gfs2_log_pointers_init(struct gfs2_sbd *sdp, unsigned int value);
3233

3334
#endif /* __RECOVERY_DOT_H__ */
3435

0 commit comments

Comments
 (0)