Commit 7c0ef28a authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Move gfs2_sync_meta to lops.c 



Since gfs2_sync_meta() is only called from a single file, lets move
it to lops.c where it is used, and mark it static. At the same
time, we can clean up the meta_io.h header too.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d6a5e06c

fs/gfs2/lops.c

+18 −0
Original line number Diff line number Diff line
@@ -579,6 +579,24 @@ static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start, 
	return error;

}



/**

 * gfs2_meta_sync - Sync all buffers associated with a glock

 * @gl: The glock

 *

 */



static void gfs2_meta_sync(struct gfs2_glock *gl)

{

	struct address_space *mapping = gfs2_glock2aspace(gl);

	int error;



	filemap_fdatawrite(mapping);

	error = filemap_fdatawait(mapping);



	if (error)

		gfs2_io_error(gl->gl_sbd);

}



static void buf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass)

{

	struct gfs2_inode *ip = GFS2_I(jd->jd_inode);

fs/gfs2/meta_io.c

+0 −18
Original line number Diff line number Diff line
@@ -97,24 +97,6 @@ const struct address_space_operations gfs2_meta_aops = { 
	.releasepage = gfs2_releasepage,

};



/**

 * gfs2_meta_sync - Sync all buffers associated with a glock

 * @gl: The glock

 *

 */



void gfs2_meta_sync(struct gfs2_glock *gl)

{

	struct address_space *mapping = gfs2_glock2aspace(gl);

	int error;



	filemap_fdatawrite(mapping);

	error = filemap_fdatawait(mapping);



	if (error)

		gfs2_io_error(gl->gl_sbd);

}



/**

 * gfs2_getbuf - Get a buffer with a given address space

 * @gl: the glock

fs/gfs2/meta_io.h

+11 −15
Original line number Diff line number Diff line
@@ -48,20 +48,16 @@ static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping) 
		return inode->i_sb->s_fs_info;

}



void gfs2_meta_sync(struct gfs2_glock *gl);



struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno);

int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno,

		   int flags, struct buffer_head **bhp);

int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh);

struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create);



void gfs2_remove_from_journal(struct buffer_head *bh, struct gfs2_trans *tr,

			      int meta);



void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen);



int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num,

extern struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno);

extern int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags,

			  struct buffer_head **bhp);

extern int gfs2_meta_wait(struct gfs2_sbd *sdp, struct buffer_head *bh);

extern struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno,

				       int create);

extern void gfs2_remove_from_journal(struct buffer_head *bh,

				     struct gfs2_trans *tr, int meta);

extern void gfs2_meta_wipe(struct gfs2_inode *ip, u64 bstart, u32 blen);

extern int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num,

				     struct buffer_head **bhp);



static inline int gfs2_meta_inode_buffer(struct gfs2_inode *ip,