fs: Remove i_nlink check from file system link callback

Now that VFS check for inode->i_nlink == 0 and returns proper
error, remove similar check from file system

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0efdb65953c577cc27fb7d190dc4f66cd7a933a2..c23f050f47c27f36a27a8d1c694b09342d4bf300 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4806,9 +4806,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
        int err;
        int drop_inode = 0;
 
-       if (inode->i_nlink == 0)
-               return -ENOENT;
-
        /* do not allow sys_link's with other subvols of the same device */
        if (root->objectid != BTRFS_I(inode)->root->objectid)
                return -EPERM;

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index b27ba71810ecdb57efbf7739559eb7bb76b1126e..561f692562663a4c42e93e223e67a5eb9a7914ee 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2253,13 +2253,6 @@ static int ext3_link (struct dentry * old_dentry,
 
        dquot_initialize(dir);
 
-       /*
-        * Return -ENOENT if we've raced with unlink and i_nlink is 0.  Doing
-        * otherwise has the potential to corrupt the orphan inode list.
-        */
-       if (inode->i_nlink == 0)
-               return -ENOENT;
-
 retry:
        handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
                                        EXT3_INDEX_EXTRA_TRANS_BLOCKS);

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5485390d32c56e1b9b4ed7bd3802213827f8894c..e781b7ea56305dfde5c7458c78294a5dcc6d9361 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2304,13 +2304,6 @@ static int ext4_link(struct dentry *old_dentry,
 
        dquot_initialize(dir);
 
-       /*
-        * Return -ENOENT if we've raced with unlink and i_nlink is 0.  Doing
-        * otherwise has the potential to corrupt the orphan inode list.
-        */
-       if (inode->i_nlink == 0)
-               return -ENOENT;
-
 retry:
        handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
                                        EXT4_INDEX_EXTRA_TRANS_BLOCKS);

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 5a2b269428a6d4f19e89659805d0b49d7b0d5297..3f04a1804931494f49bf0e7fe91d212721eb185d 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -809,9 +809,6 @@ static int jfs_link(struct dentry *old_dentry,
        if (ip->i_nlink == JFS_LINK_MAX)
                return -EMLINK;
 
-       if (ip->i_nlink == 0)
-               return -ENOENT;
-
        dquot_initialize(dir);
 
        tid = txBegin(ip->i_sb, 0);

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 68fdf45cc6c923325d80d7abff701211519eb43b..4b2eb564fdadf66a677a22c719e7dea8277b9ad3 100644 (file)
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -1122,10 +1122,6 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
                reiserfs_write_unlock(dir->i_sb);
                return -EMLINK;
        }
-       if (inode->i_nlink == 0) {
-               reiserfs_write_unlock(dir->i_sb);
-               return -ENOENT;
-       }
 
        /* inc before scheduling so reiserfs_unlink knows we are here */
        inc_nlink(inode);

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 14f64b689d7f58edef4be03d58a8712c442f62ef..7217d67a80a691a8114e4d7f04d2f98037d03997 100644 (file)
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -522,24 +522,6 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
        ubifs_assert(mutex_is_locked(&dir->i_mutex));
        ubifs_assert(mutex_is_locked(&inode->i_mutex));
 
-       /*
-        * Return -ENOENT if we've raced with unlink and i_nlink is 0.  Doing
-        * otherwise has the potential to corrupt the orphan inode list.
-        *
-        * Indeed, consider a scenario when 'vfs_link(dirA/fileA)' and
-        * 'vfs_unlink(dirA/fileA, dirB/fileB)' race. 'vfs_link()' does not
-        * lock 'dirA->i_mutex', so this is possible. Both of the functions
-        * lock 'fileA->i_mutex' though. Suppose 'vfs_unlink()' wins, and takes
-        * 'fileA->i_mutex' mutex first. Suppose 'fileA->i_nlink' is 1. In this
-        * case 'ubifs_unlink()' will drop the last reference, and put 'inodeA'
-        * to the list of orphans. After this, 'vfs_link()' will link
-        * 'dirB/fileB' to 'inodeA'. This is a problem because, for example,
-        * the subsequent 'vfs_unlink(dirB/fileB)' will add the same inode
-        * to the list of orphans.
-        */
-        if (inode->i_nlink == 0)
-                return -ENOENT;
-
        err = dbg_check_synced_i_size(inode);
        if (err)
                return err;