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

Commit 73b462d2 authored by Bob Peterson's avatar Bob Peterson
Browse files

GFS2: Eliminate parameter non_block on gfs2_inode_lookup 



Now that we're not filtering out I_FREEING inodes from our lookups
anymore, we can eliminate the non_block parameter from the lookup
function.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent ff34245d

fs/gfs2/dir.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1660,7 +1660,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name, 
		brelse(bh);

		brelse(bh);

		if (fail_on_exist)

		if (fail_on_exist)

			return ERR_PTR(-EEXIST);

			return ERR_PTR(-EEXIST);

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

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

		if (!IS_ERR(inode))

		if (!IS_ERR(inode))

			GFS2_I(inode)->i_rahead = rahead;

			GFS2_I(inode)->i_rahead = rahead;

		return inode;

		return inode;

fs/gfs2/inode.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -80,13 +80,12 @@ static void gfs2_set_iop(struct inode *inode) 
 * @sb: The super block

 * @sb: The super block

 * @no_addr: The inode number

 * @no_addr: The inode number

 * @type: The type of the inode

 * @type: The type of the inode

 * non_block: Can we block on inodes that are being freed?

 *

 *

 * Returns: A VFS inode, or an error

 * Returns: A VFS inode, or an error

 */

 */





struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,

struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,

				u64 no_addr, u64 no_formal_ino, int non_block)

				u64 no_addr, u64 no_formal_ino)

{

{

	struct inode *inode;

	struct inode *inode;

	struct gfs2_inode *ip;

	struct gfs2_inode *ip;
@@ -170,7 +169,7 @@ struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr, 
	if (error)

	if (error)

		goto fail;

		goto fail;





	inode = gfs2_inode_lookup(sb, DT_UNKNOWN, no_addr, 0, 1);

	inode = gfs2_inode_lookup(sb, DT_UNKNOWN, no_addr, 0);

	if (IS_ERR(inode))

	if (IS_ERR(inode))

		goto fail;

		goto fail;

fs/gfs2/inode.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -94,8 +94,7 @@ static inline int gfs2_check_internal_file_size(struct inode *inode, 
}

}





extern struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type, 

extern struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type, 

				       u64 no_addr, u64 no_formal_ino,

				       u64 no_addr, u64 no_formal_ino);

				       int non_block);

extern struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr,

extern struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr,

					 u64 *no_formal_ino,

					 u64 *no_formal_ino,

					 unsigned int blktype);

					 unsigned int blktype);

fs/gfs2/ops_fstype.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -454,7 +454,7 @@ static int gfs2_lookup_root(struct super_block *sb, struct dentry **dptr, 
	struct dentry *dentry;

	struct dentry *dentry;

	struct inode *inode;

	struct inode *inode;





	inode = gfs2_inode_lookup(sb, DT_DIR, no_addr, 0, 0);

	inode = gfs2_inode_lookup(sb, DT_DIR, no_addr, 0);

	if (IS_ERR(inode)) {

	if (IS_ERR(inode)) {

		fs_err(sdp, "can't read in %s inode: %ld\n", name, PTR_ERR(inode));

		fs_err(sdp, "can't read in %s inode: %ld\n", name, PTR_ERR(inode));

		return PTR_ERR(inode);

		return PTR_ERR(inode);