From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Gruenbacher Date: Wed, 31 May 2017 17:03:10 +0200 Subject: [Cluster-devel] [PATCH 6/8] gfs2: Get rid of gfs2_set_nlink In-Reply-To: <1496242992-1607-1-git-send-email-agruenba@redhat.com> References: <1496242992-1607-1-git-send-email-agruenba@redhat.com> Message-ID: <1496242992-1607-7-git-send-email-agruenba@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Remove gfs2_set_nlink which prevents the link count of an inode to become non-zero once it has reached zero. The following changes will reduce the amount of waiting on glocks when an inode is evicted from memory. With that, it seems that an inode can become reallocated before all the remote-unlink callbacks from a previous delete have been processed. In that case, the link count will change from zero to non-zero. Signed-off-by: Andreas Gruenbacher --- fs/gfs2/glops.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 238a78c..29d58fd 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -324,32 +324,6 @@ static int inode_go_demote_ok(const struct gfs2_glock *gl) return 1; } -/** - * gfs2_set_nlink - Set the inode's link count based on on-disk info - * @inode: The inode in question - * @nlink: The link count - * - * If the link count has hit zero, it must never be raised, whatever the - * on-disk inode might say. When new struct inodes are created the link - * count is set to 1, so that we can safely use this test even when reading - * in on disk information for the first time. - */ - -static void gfs2_set_nlink(struct inode *inode, u32 nlink) -{ - /* - * We will need to review setting the nlink count here in the - * light of the forthcoming ro bind mount work. This is a reminder - * to do that. - */ - if ((inode->i_nlink != nlink) && (inode->i_nlink != 0)) { - if (nlink == 0) - clear_nlink(inode); - else - set_nlink(inode, nlink); - } -} - static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) { const struct gfs2_dinode *str = buf; @@ -371,7 +345,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) i_uid_write(&ip->i_inode, be32_to_cpu(str->di_uid)); i_gid_write(&ip->i_inode, be32_to_cpu(str->di_gid)); - gfs2_set_nlink(&ip->i_inode, be32_to_cpu(str->di_nlink)); + set_nlink(&ip->i_inode, be32_to_cpu(str->di_nlink)); i_size_write(&ip->i_inode, be64_to_cpu(str->di_size)); gfs2_set_inode_blocks(&ip->i_inode, be64_to_cpu(str->di_blocks)); atime.tv_sec = be64_to_cpu(str->di_atime); -- 2.7.4