Move gfs2_meta_syncfs() into log.c [57/70]
From a25311c8e0b7071b129ca9a9e49e22eeaf620864 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Thu, 23 Nov 2006 11:06:35 -0500
Subject: [PATCH] [GFS2] Move gfs2_meta_syncfs() into log.c
By moving gfs2_meta_syncfs() into log.c, gfs2_ail1_start() can be made static.
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/log.c | 21 ++++++++++++++++++++- fs/gfs2/log.h | 2 +- fs/gfs2/meta_io.c | 17 ----------------- fs/gfs2/meta_io.h | 1 - 4 files changed, 21 insertions(+), 20 deletions(-)
fs/gfs2/log.c +20 -1
@@ -15,6 +15,7 @@ #include <linux/buffer_head.h>#include <linux/gfs2_ondisk.h> #include <linux/crc32.h> #include <linux/lm_interface.h> +#include <linux/delay.h> #include "gfs2.h" #include "incore.h"
@@ -142,7 +143,7 @@ static int gfs2_ail1_empty_one(struct gfreturn list_empty (&ai->ai_ail1_list); } -void gfs2_ail1_start (struct gfs2_sbd *sdp,int flags) +static void gfs2_ail1_start (struct gfs2_sbd *sdp,int flags) {struct list_head *head = &sdp->sd_ail1_list;u64 sync_gen;
@@ -689,3 +690,21 @@ void gfs2_log_shutdown(struct gfs2_sbd *up_write (&sdp->sd_log_flush_lock); } + +/** +* gfs2_meta_syncfs - sync all the buffers in a filesystem +* @sdp: the filesystem +* +*/ + +void gfs2_meta_syncfs (struct gfs2_sbd *sdp) +{ +gfs2_log_flush (sdp,NULL ); +for (;;) { +gfs2_ail1_start (sdp,DIO_ALL ); +if (gfs2_ail1_empty (sdp,DIO_ALL )) +break ; +msleep (10 ); + } +} +
fs/gfs2/log.h +1 -1
@@ -48,7 +48,6 @@ static inline void gfs2_log_pointers_iniunsigned int gfs2_struct2blk (struct gfs2_sbd *sdp,unsigned int nstruct,unsigned int ssize); -void gfs2_ail1_start (struct gfs2_sbd *sdp,int flags);int gfs2_ail1_empty (struct gfs2_sbd *sdp,int flags);int gfs2_log_reserve (struct gfs2_sbd *sdp,unsigned int blks);
@@ -61,5 +60,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdpvoid gfs2_log_commit (struct gfs2_sbd *sdp,struct gfs2_trans *trans);void gfs2_log_shutdown (struct gfs2_sbd *sdp); +void gfs2_meta_syncfs (struct gfs2_sbd *sdp);#endif /* __LOG_DOT_H__ */
fs/gfs2/meta_io.c +0 -17
@@ -574,20 +574,3 @@ out:return first_bh; } -/** -* gfs2_meta_syncfs - sync all the buffers in a filesystem -* @sdp: the filesystem -* -*/ - -void gfs2_meta_syncfs (struct gfs2_sbd *sdp) -{ -gfs2_log_flush (sdp,NULL ); -for (;;) { -gfs2_ail1_start (sdp,DIO_ALL ); -if (gfs2_ail1_empty (sdp,DIO_ALL )) -break ; -msleep (10 ); - } -} -
fs/gfs2/meta_io.h +0 -1
@@ -67,7 +67,6 @@ static inline int gfs2_meta_inode_buffer }struct buffer_head *gfs2_meta_ra (struct gfs2_glock *gl,u64 dblock,u32 extlen); -void gfs2_meta_syncfs (struct gfs2_sbd *sdp);#define buffer_busy (bh) \ ((bh)->b_state & ((1ul << BH_Dirty) | (1ul << BH_Lock) | (1ul << BH_Pinned)))
Signature · 1 line
1.4.1
Quoted 7 lines · Steven Whitehouse
Quoted 1 line
From
a25311c8e0b7071b129ca9a9e49e22eeaf620864Mon Sep 17 00:00:00 2001From: Steven Whitehouse <[email protected]>
Date: Thu, 23 Nov 2006 11:06:35 -0500
Subject: [PATCH] [GFS2] Movegfs2_meta_syncfs()intolog.cBy moving
gfs2_meta_syncfs()intolog.c,gfs2_ail1_start()can be made static.
While this is not a incorrect change as it stands. This kind of pointless code curn is making it harder to stabilize GFS2.
Quoted 108 lines
Signed-off-by Steven Whitehouse <[email protected]>--- fs/gfs2/log.c | 21 ++++++++++++++++++++- fs/gfs2/log.h | 2 +- fs/gfs2/meta_io.c | 17 ----------------- fs/gfs2/meta_io.h | 1 - 4 files changed, 21 insertions(+), 20 deletions(-)fs/gfs2/log.c +20
-1@@ -15,6 +15,7 @@ #include <linux/buffer_head.h>#include <linux/gfs2_ondisk.h> #include <linux/crc32.h> #include <linux/lm_interface.h> +#include <linux/delay.h> #include "gfs2.h" #include "incore.h" @@ -142,7 +143,7 @@ static int gfs2_ail1_empty_one(struct gfreturn list_empty (&ai->ai_ail1_list); } -void gfs2_ail1_start (struct gfs2_sbd *sdp,int flags) +static void gfs2_ail1_start (struct gfs2_sbd *sdp,int flags) {struct list_head *head = &sdp->sd_ail1_list;u64 sync_gen;@@ -689,3 +690,21 @@ void gfs2_log_shutdown(struct gfs2_sbd *up_write (&sdp->sd_log_flush_lock); } + +/** +* gfs2_meta_syncfs - sync all the buffers in a filesystem +* @sdp: the filesystem +* +*/ + +void gfs2_meta_syncfs (struct gfs2_sbd *sdp) +{ +gfs2_log_flush (sdp,NULL ); +for (;;) { +gfs2_ail1_start (sdp,DIO_ALL ); +if (gfs2_ail1_empty (sdp,DIO_ALL )) +break ; +msleep (10 ); + } +} +fs/gfs2/log.h +1
-1@@ -48,7 +48,6 @@ static inline void gfs2_log_pointers_iniunsigned int gfs2_struct2blk (struct gfs2_sbd *sdp,unsigned int nstruct,unsigned int ssize); -void gfs2_ail1_start (struct gfs2_sbd *sdp,int flags);int gfs2_ail1_empty (struct gfs2_sbd *sdp,int flags);int gfs2_log_reserve (struct gfs2_sbd *sdp,unsigned int blks);@@ -61,5 +60,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdpvoid gfs2_log_commit (struct gfs2_sbd *sdp,struct gfs2_trans *trans);void gfs2_log_shutdown (struct gfs2_sbd *sdp); +void gfs2_meta_syncfs (struct gfs2_sbd *sdp);#endif /* __LOG_DOT_H__ */ fs/gfs2/meta_io.c +0
-17@@ -574,20 +574,3 @@ out:return first_bh; } -/** -* gfs2_meta_syncfs - sync all the buffers in a filesystem -* @sdp: the filesystem -* -*/ - -void gfs2_meta_syncfs (struct gfs2_sbd *sdp) -{ -gfs2_log_flush (sdp,NULL ); -for (;;) { -gfs2_ail1_start (sdp,DIO_ALL ); -if (gfs2_ail1_empty (sdp,DIO_ALL )) -break ; -msleep (10 ); - } -} -fs/gfs2/meta_io.h +0
-1@@ -67,7 +67,6 @@ static inline int gfs2_meta_inode_buffer }struct buffer_head *gfs2_meta_ra (struct gfs2_glock *gl,u64 dblock,u32 extlen); -void gfs2_meta_syncfs (struct gfs2_sbd *sdp);#define buffer_busy (bh) \ ((bh)->b_state & ((1ul << BH_Dirty) | (1ul << BH_Lock) | (1ul << BH_Pinned)))
Signature · 8 lines
Russell Cattelan <[email protected]> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: <http://listman.redhat.com/archives/cluster-devel/attachments/20061201/ec6124aa/attachment.sig>