Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d57703 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Bob Peterson
Browse files

gfs2: Extended attribute readahead 



When gfs2 allocates an inode and its extended attribute block next to
each other at inode create time, the inode's directory entry indicates
that in de_rahead.  In that case, we can readahead the extended
attribute block when we read in the inode.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent 3dd1dd8c

fs/gfs2/dir.c

+11 −4
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int gfs2_dir_get_existing_buffer(struct gfs2_inode *ip, u64 block, 
	struct buffer_head *bh;

	int error;



	error = gfs2_meta_read(ip->i_gl, block, DIO_WAIT, &bh);

	error = gfs2_meta_read(ip->i_gl, block, DIO_WAIT, 0, &bh);

	if (error)

		return error;

	if (gfs2_metatype_check(GFS2_SB(&ip->i_inode), bh, GFS2_METATYPE_JD)) {
@@ -305,7 +305,7 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, __be64 *buf, 
			BUG_ON(extlen < 1);

			bh = gfs2_meta_ra(ip->i_gl, dblock, extlen);

		} else {

			error = gfs2_meta_read(ip->i_gl, dblock, DIO_WAIT, &bh);

			error = gfs2_meta_read(ip->i_gl, dblock, DIO_WAIT, 0, &bh);

			if (error)

				goto fail;

		}
@@ -723,7 +723,7 @@ static int get_leaf(struct gfs2_inode *dip, u64 leaf_no, 
{

	int error;



	error = gfs2_meta_read(dip->i_gl, leaf_no, DIO_WAIT, bhp);

	error = gfs2_meta_read(dip->i_gl, leaf_no, DIO_WAIT, 0, bhp);

	if (!error && gfs2_metatype_check(GFS2_SB(&dip->i_inode), *bhp, GFS2_METATYPE_LF)) {

		/* pr_info("block num=%llu\n", leaf_no); */

		error = -EIO;
@@ -1560,15 +1560,22 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name, 


	dent = gfs2_dirent_search(dir, name, gfs2_dirent_find, &bh);

	if (dent) {

		struct inode *inode;

		u16 rahead;



		if (IS_ERR(dent))

			return ERR_CAST(dent);

		dtype = be16_to_cpu(dent->de_type);

		rahead = be16_to_cpu(dent->de_rahead);

		addr = be64_to_cpu(dent->de_inum.no_addr);

		formal_ino = be64_to_cpu(dent->de_inum.no_formal_ino);

		brelse(bh);

		if (fail_on_exist)

			return ERR_PTR(-EEXIST);

		return gfs2_inode_lookup(dir->i_sb, dtype, addr, formal_ino, 0);

		inode = gfs2_inode_lookup(dir->i_sb, dtype, addr, formal_ino, 0);

		if (!IS_ERR(inode))

			GFS2_I(inode)->i_rahead = rahead;

		return inode;

	}

	return ERR_PTR(-ENOENT);

}

fs/gfs2/incore.h

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ struct gfs2_inode { 
	u32 i_diskflags;

	u8 i_height;

	u8 i_depth;

	u16 i_rahead;

};



/*

fs/gfs2/meta_io.c

+25 −2
Original line number Diff line number Diff line
@@ -187,6 +187,21 @@ struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno) 
	return bh;

}



static void gfs2_meta_readahead(struct gfs2_glock *gl, u64 blkno)

{

	struct buffer_head *bh;



	bh = gfs2_getbuf(gl, blkno, 1);

	lock_buffer(bh);

	if (buffer_uptodate(bh)) {

		unlock_buffer(bh);

		brelse(bh);

		return;

	}

	bh->b_end_io = end_buffer_read_sync;

	submit_bh(READA | REQ_META | REQ_PRIO, bh);

}



/**

 * gfs2_meta_read - Read a block from disk

 * @gl: The glock covering the block
@@ -198,7 +213,7 @@ 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 rahead, struct buffer_head **bhp)

{

	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

	struct buffer_head *bh;
@@ -213,11 +228,15 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags, 
	lock_buffer(bh);

	if (buffer_uptodate(bh)) {

		unlock_buffer(bh);

		if (rahead)

			gfs2_meta_readahead(gl, blkno + 1);

		return 0;

	}

	bh->b_end_io = end_buffer_read_sync;

	get_bh(bh);

	submit_bh(READ_SYNC | REQ_META | REQ_PRIO, bh);

	if (rahead)

		gfs2_meta_readahead(gl, blkno + 1);

	if (!(flags & DIO_WAIT))

		return 0;
@@ -341,8 +360,12 @@ int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num, 
	struct buffer_head *bh;

	int ret = 0;

	u32 mtype = height ? GFS2_METATYPE_IN : GFS2_METATYPE_DI;

	int rahead = 0;



	if (num == ip->i_no_addr)

		rahead = ip->i_rahead;



	ret = gfs2_meta_read(gl, num, DIO_WAIT, &bh);

	ret = gfs2_meta_read(gl, num, DIO_WAIT, rahead, &bh);

	if (ret == 0 && gfs2_metatype_check(sdp, bh, mtype)) {

		brelse(bh);

		ret = -EIO;

fs/gfs2/meta_io.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping) 


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);

			  int rahead, 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);

fs/gfs2/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int bh_get(struct gfs2_quota_data *qd) 
	error = gfs2_block_map(&ip->i_inode, block, &bh_map, 0);

	if (error)

		goto fail;

	error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, &bh);

	error = gfs2_meta_read(ip->i_gl, bh_map.b_blocknr, DIO_WAIT, 0, &bh);

	if (error)

		goto fail;

	error = -EIO;