Revert "gfs2: read journal in large chunks to locate the head"
PATCH 1/1 Revert "gfs2: read journal in large chunks to locate the head"
In reply to a message not in the archiveThis reverts commit 2a5f14f279f59143139bcd1606903f2f80a34241.
This patch causes xfstests generic/311 to fail. Reverting this for now until we have a proper fix.
Signed-off-by Abhi Das <[email protected]>
Signed-off-by Bob Peterson <[email protected]>
--- fs/gfs2/glops.c | 1 - fs/gfs2/log.c | 4 +- fs/gfs2/lops.c | 190 ++------------------------------------------------- fs/gfs2/lops.h | 4 +- fs/gfs2/ops_fstype.c | 1 - fs/gfs2/recovery.c | 123 +++++++++++++++++++++++++++++++++ fs/gfs2/recovery.h | 2 + fs/gfs2/super.c | 1 - 8 files changed, 134 insertions(+), 192 deletions(-)
fs/gfs2/glops.c +0 -1
@@ -28,7 +28,6 @@#include "util.h" #include "trans.h" #include "dir.h" -#include "lops.h" struct workqueue_struct *gfs2_freeze_wq;
fs/gfs2/log.c +2 -2
@@ -733,7 +733,7 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd, lh->lh_crc =cpu_to_be32 (crc);gfs2_log_write (sdp, page, sb->s_blocksize,0 , addr); -gfs2_log_submit_bio (&sdp->sd_log_bio,REQ_OP_WRITE | op_flags); +gfs2_log_submit_bio (&sdp->sd_log_bio,REQ_OP_WRITE , op_flags);log_flush_wait (sdp); }
@@ -810,7 +810,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)gfs2_ordered_write (sdp);lops_before_commit (sdp, tr); -gfs2_log_submit_bio (&sdp->sd_log_bio,REQ_OP_WRITE ); +gfs2_log_submit_bio (&sdp->sd_log_bio,REQ_OP_WRITE ,0 );if (sdp->sd_log_head != sdp->sd_log_flush_head) {log_flush_wait (sdp);
fs/gfs2/lops.c +6 -184
231 lines not on this page · raw message
fs/gfs2/lops.h +1 -3
@@ -30,10 +30,8 @@ extern u64 gfs2_log_bmap(struct gfs2_sbd *sdp);extern void gfs2_log_write (struct gfs2_sbd *sdp,struct page *page,unsigned size,unsigned offset,u64 blkno);extern void gfs2_log_write_page (struct gfs2_sbd *sdp,struct page *page); -extern void gfs2_log_submit_bio (struct bio **biop,int opf); +extern void gfs2_log_submit_bio (struct bio **biop,int op,int op_flags);extern void gfs2_pin (struct gfs2_sbd *sdp,struct buffer_head *bh); -extern int gfs2_find_jhead (struct gfs2_jdesc *jd, -struct gfs2_log_header_host *head);static inline unsigned int buf_limit (struct gfs2_sbd *sdp) {
fs/gfs2/ops_fstype.c +0 -1
@@ -41,7 +41,6 @@#include "dir.h" #include "meta_io.h" #include "trace_gfs2.h" -#include "lops.h" #define DO 0#define UNDO 1
fs/gfs2/recovery.c +123 -0
129 lines not on this page · raw message
fs/gfs2/recovery.h +2 -0
@@ -27,6 +27,8 @@ extern int gfs2_revoke_add(struct gfs2_jdesc *jd, u64 blkno, unsigned int where)extern int gfs2_revoke_check (struct gfs2_jdesc *jd,u64 blkno,unsigned int where);extern void gfs2_revoke_clean (struct gfs2_jdesc *jd); +extern int gfs2_find_jhead (struct gfs2_jdesc *jd, +struct gfs2_log_header_host *head);extern int gfs2_recover_journal (struct gfs2_jdesc *gfs2_jd,bool wait);extern void gfs2_recover_func (struct work_struct *work); extern int __get_log_header(struct gfs2_sbd *sdp,
fs/gfs2/super.c +0 -1
@@ -45,7 +45,6 @@#include "util.h" #include "sys.h" #include "xattr.h" -#include "lops.h" #define args_neq (a1, a2, x) ((a1)->ar_##x != (a2)->ar_##x)