[Cluster-devel] [PATCH 3/4] GFS2: Eliminate parameter non_block on gfs2_inode_lookup

[Steven Whitehouse <swhiteho@redhat.com>]

Acked-by: Steven Whitehouse <swhiteho@redhat.com>

On 18/12/15 19:02, Bob Peterson wrote:
> 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: Bob Peterson <rpeterso@redhat.com>
> ---
>   fs/gfs2/dir.c        | 2 +-
>   fs/gfs2/inode.c      | 5 ++---
>   fs/gfs2/inode.h      | 3 +--
>   fs/gfs2/ops_fstype.c | 2 +-
>   4 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
> index 6a92592..2bef023 100644
> --- a/fs/gfs2/dir.c
> +++ b/fs/gfs2/dir.c
> @@ -1660,7 +1660,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name,
>   		brelse(bh);
>   		if (fail_on_exist)
>   			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))
>   			GFS2_I(inode)->i_rahead = rahead;
>   		return inode;
> diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
> index 2adc1ee..01b6d1a 100644
> --- a/fs/gfs2/inode.c
> +++ b/fs/gfs2/inode.c
> @@ -80,13 +80,12 @@ static void gfs2_set_iop(struct inode *inode)
>    * @sb: The super block
>    * @no_addr: The inode number
>    * @type: The type of the inode
> - * non_block: Can we block on inodes that are being freed?
>    *
>    * Returns: A VFS inode, or an error
>    */
>   
>   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 gfs2_inode *ip;
> @@ -170,7 +169,7 @@ struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr,
>   	if (error)
>   		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))
>   		goto fail;
>   
> diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h
> index 22c27a8..e1af0d4 100644
> --- a/fs/gfs2/inode.h
> +++ b/fs/gfs2/inode.h
> @@ -94,8 +94,7 @@ err:
>   }
>   
>   extern struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned type,
> -				       u64 no_addr, u64 no_formal_ino,
> -				       int non_block);
> +				       u64 no_addr, u64 no_formal_ino);
>   extern struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr,
>   					 u64 *no_formal_ino,
>   					 unsigned int blktype);
> diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
> index 7aacdf2..9ed522c 100644
> --- a/fs/gfs2/ops_fstype.c
> +++ b/fs/gfs2/ops_fstype.c
> @@ -454,7 +454,7 @@ static int gfs2_lookup_root(struct super_block *sb, struct dentry **dptr,
>   	struct dentry *dentry;
>   	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)) {
>   		fs_err(sdp, "can't read in %s inode: %ld\n", name, PTR_ERR(inode));
>   		return PTR_ERR(inode);