diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2012-12-14 07:29:56 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2013-01-29 05:27:46 -0500 |
commit | 75f2b879aeb3158daf6aa95d135803f7e71df06b (patch) | |
tree | 30bf176b742d11a4e71f2f0a1e3495f45e337a75 /fs/gfs2/lops.c | |
parent | 2a005855938235771b6960206d7581a4933cf6b7 (diff) |
GFS2: Merge revoke adding functions
This moves the lo_add function for revokes into trans.c, removing
a function call and making the code easier to read.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/lops.c')
-rw-r--r-- | fs/gfs2/lops.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 9ceccb1595a3..9c8074223461 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c | |||
@@ -600,20 +600,6 @@ static void buf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass) | |||
600 | jd->jd_jid, sdp->sd_replayed_blocks, sdp->sd_found_blocks); | 600 | jd->jd_jid, sdp->sd_replayed_blocks, sdp->sd_found_blocks); |
601 | } | 601 | } |
602 | 602 | ||
603 | static void revoke_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) | ||
604 | { | ||
605 | struct gfs2_glock *gl = bd->bd_gl; | ||
606 | struct gfs2_trans *tr; | ||
607 | |||
608 | tr = current->journal_info; | ||
609 | tr->tr_touched = 1; | ||
610 | tr->tr_num_revoke++; | ||
611 | sdp->sd_log_num_revoke++; | ||
612 | atomic_inc(&gl->gl_revokes); | ||
613 | set_bit(GLF_LFLUSH, &gl->gl_flags); | ||
614 | list_add(&bd->bd_list, &sdp->sd_log_le_revoke); | ||
615 | } | ||
616 | |||
617 | static void revoke_lo_before_commit(struct gfs2_sbd *sdp) | 603 | static void revoke_lo_before_commit(struct gfs2_sbd *sdp) |
618 | { | 604 | { |
619 | struct gfs2_meta_header *mh; | 605 | struct gfs2_meta_header *mh; |
@@ -895,7 +881,6 @@ const struct gfs2_log_operations gfs2_buf_lops = { | |||
895 | }; | 881 | }; |
896 | 882 | ||
897 | const struct gfs2_log_operations gfs2_revoke_lops = { | 883 | const struct gfs2_log_operations gfs2_revoke_lops = { |
898 | .lo_add = revoke_lo_add, | ||
899 | .lo_before_commit = revoke_lo_before_commit, | 884 | .lo_before_commit = revoke_lo_before_commit, |
900 | .lo_after_commit = revoke_lo_after_commit, | 885 | .lo_after_commit = revoke_lo_after_commit, |
901 | .lo_before_scan = revoke_lo_before_scan, | 886 | .lo_before_scan = revoke_lo_before_scan, |