Commit 062fb903 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Rename gfs2_lookup_{ simple => meta } 



Function gfs2_lookup_simple() is used for looking up inodes in the
metadata directory tree, so rename it to gfs2_lookup_meta() to closer
match its purpose.  Clean the function up a little on the way.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent be7f6a6b

fs/gfs2/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -265,17 +265,18 @@ struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr, 
}





struct inode *gfs2_lookup_simple(struct inode *dip, const char *name)

/**

 * gfs2_lookup_meta - Look up an inode in a metadata directory

 * @dip: The directory

 * @name: The name of the inode

 */

struct inode *gfs2_lookup_meta(struct inode *dip, const char *name)

{

	struct qstr qstr;

	struct inode *inode;



	gfs2_str2qstr(&qstr, name);

	inode = gfs2_lookupi(dip, &qstr, 1);

	/* gfs2_lookupi has inconsistent callers: vfs

	 * related routines expect NULL for no entry found,

	 * gfs2_lookup_simple callers expect ENOENT

	 * and do not check for NULL.

	 */

	if (IS_ERR_OR_NULL(inode))

		return inode ? inode : ERR_PTR(-ENOENT);

fs/gfs2/inode.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ extern struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, 
				  int is_root);

extern int gfs2_permission(struct mnt_idmap *idmap,

			   struct inode *inode, int mask);

extern struct inode *gfs2_lookup_simple(struct inode *dip, const char *name);

extern struct inode *gfs2_lookup_meta(struct inode *dip, const char *name);

extern void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);

extern int gfs2_open_common(struct inode *inode, struct file *file);

extern loff_t gfs2_seek_data(struct file *file, loff_t offset);

fs/gfs2/ops_fstype.c

+8 −8
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int init_statfs(struct gfs2_sbd *sdp) 
	struct gfs2_jdesc *jd;

	struct gfs2_inode *ip;



	sdp->sd_statfs_inode = gfs2_lookup_simple(master, "statfs");

	sdp->sd_statfs_inode = gfs2_lookup_meta(master, "statfs");

	if (IS_ERR(sdp->sd_statfs_inode)) {

		error = PTR_ERR(sdp->sd_statfs_inode);

		fs_err(sdp, "can't read in statfs inode: %d\n", error);
@@ -656,7 +656,7 @@ static int init_statfs(struct gfs2_sbd *sdp) 
	if (sdp->sd_args.ar_spectator)

		goto out;



	pn = gfs2_lookup_simple(master, "per_node");

	pn = gfs2_lookup_meta(master, "per_node");

	if (IS_ERR(pn)) {

		error = PTR_ERR(pn);

		fs_err(sdp, "can't find per_node directory: %d\n", error);
@@ -673,7 +673,7 @@ static int init_statfs(struct gfs2_sbd *sdp) 
			goto free_local;

		}

		sprintf(buf, "statfs_change%u", jd->jd_jid);

		lsi->si_sc_inode = gfs2_lookup_simple(pn, buf);

		lsi->si_sc_inode = gfs2_lookup_meta(pn, buf);

		if (IS_ERR(lsi->si_sc_inode)) {

			error = PTR_ERR(lsi->si_sc_inode);

			fs_err(sdp, "can't find local \"sc\" file#%u: %d\n",
@@ -738,7 +738,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo) 
	if (undo)

		goto fail_statfs;



	sdp->sd_jindex = gfs2_lookup_simple(master, "jindex");

	sdp->sd_jindex = gfs2_lookup_meta(master, "jindex");

	if (IS_ERR(sdp->sd_jindex)) {

		fs_err(sdp, "can't lookup journal index: %d\n", error);

		return PTR_ERR(sdp->sd_jindex);
@@ -887,7 +887,7 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo) 
		goto fail;



	/* Read in the resource index inode */

	sdp->sd_rindex = gfs2_lookup_simple(master, "rindex");

	sdp->sd_rindex = gfs2_lookup_meta(master, "rindex");

	if (IS_ERR(sdp->sd_rindex)) {

		error = PTR_ERR(sdp->sd_rindex);

		fs_err(sdp, "can't get resource index inode: %d\n", error);
@@ -896,7 +896,7 @@ static int init_inodes(struct gfs2_sbd *sdp, int undo) 
	sdp->sd_rindex_uptodate = 0;



	/* Read in the quota inode */

	sdp->sd_quota_inode = gfs2_lookup_simple(master, "quota");

	sdp->sd_quota_inode = gfs2_lookup_meta(master, "quota");

	if (IS_ERR(sdp->sd_quota_inode)) {

		error = PTR_ERR(sdp->sd_quota_inode);

		fs_err(sdp, "can't get quota file inode: %d\n", error);
@@ -940,7 +940,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo) 
	if (undo)

		goto fail_qc_gh;



	pn = gfs2_lookup_simple(master, "per_node");

	pn = gfs2_lookup_meta(master, "per_node");

	if (IS_ERR(pn)) {

		error = PTR_ERR(pn);

		fs_err(sdp, "can't find per_node directory: %d\n", error);
@@ -948,7 +948,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo) 
	}



	sprintf(buf, "quota_change%u", sdp->sd_jdesc->jd_jid);

	sdp->sd_qc_inode = gfs2_lookup_simple(pn, buf);

	sdp->sd_qc_inode = gfs2_lookup_meta(pn, buf);

	if (IS_ERR(sdp->sd_qc_inode)) {

		error = PTR_ERR(sdp->sd_qc_inode);

		fs_err(sdp, "can't find local \"qc\" file: %d\n", error);