Commit 8dc14966 authored by Andrew Price's avatar Andrew Price Committed by Andreas Gruenbacher
Browse files

gfs2: Remove duplicate i_nlink check from gfs2_link() 



The duplication is:

    struct gfs2_inode *ip = GFS2_I(inode);
    [...]
    error = -ENOENT;
    if (inode->i_nlink == 0)
        goto out_gunlock;
    [...]
    error = -EINVAL;
    if (!ip->i_inode.i_nlink)
        goto out_gunlock;

The second check is removed. ENOENT is the correct error code for
attempts to link a deleted inode (ref: link(2)).

If we support O_TMPFILE in future the check will need to be updated with
an exception for inodes flagged I_LINKABLE so sorting out this
duplication now will make it a slightly cleaner change.

Signed-off-by: default avatarAndrew Price <anprice@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 1e760fa3

fs/gfs2/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -992,9 +992,6 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, 
	error = -EPERM;

	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))

		goto out_gunlock;

	error = -EINVAL;

	if (!ip->i_inode.i_nlink)

		goto out_gunlock;

	error = -EMLINK;

	if (ip->i_inode.i_nlink == (u32)-1)

		goto out_gunlock;