From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Mon, 5 Oct 2015 10:36:34 -0500 Subject: [Cluster-devel] [GFS2 PATCH 12/15] gfs2: Remove unused param non_block from gfs2_inode_lookup In-Reply-To: <1444059397-4705-1-git-send-email-rpeterso@redhat.com> References: <1444059397-4705-1-git-send-email-rpeterso@redhat.com> Message-ID: <1444059397-4705-13-git-send-email-rpeterso@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Function gfs2_inode_lookup had parameter non_block which is no longer used. This patch removes it and fixes the comments and callers. Signed-off-by: Bob Peterson --- fs/gfs2/dir.c | 2 +- fs/gfs2/inode.c | 8 ++++---- fs/gfs2/inode.h | 3 +-- fs/gfs2/ops_fstype.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 487527b..f4caf2f 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -1563,7 +1563,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name, brelse(bh); if (fail_on_exist) return ERR_PTR(-EEXIST); - return gfs2_inode_lookup(dir->i_sb, dtype, addr, formal_ino, 0); + return gfs2_inode_lookup(dir->i_sb, dtype, addr, formal_ino); } return ERR_PTR(-ENOENT); } diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 1c57f7d..631d4ef 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -78,15 +78,15 @@ static void gfs2_set_iop(struct inode *inode) /** * gfs2_inode_lookup - Lookup an 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? + * @no_addr: The inode number + * @no_formal_ino: The formal inode number (for NFS) * * 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; @@ -304,7 +304,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 031e301..9e838b3 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_inode_lookup_for_del(struct super_block *sb, u64 no_addr); extern struct inode *gfs2_lookup_by_inum(struct gfs2_sbd *sdp, u64 no_addr, diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index baab99b..ee44116 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -451,7 +451,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); -- 2.4.3