Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi...

[cascardo/linux.git] / fs / ufs / namei.c

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 38cac19..a2281ca 100644 (file)
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -166,10 +166,6 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
        int error;
 
        lock_ufs(dir->i_sb);
-       if (inode->i_nlink >= UFS_LINK_MAX) {
-               unlock_ufs(dir->i_sb);
-               return -EMLINK;
-       }
 
        inode->i_ctime = CURRENT_TIME_SEC;
        inode_inc_link_count(inode);
@@ -183,10 +179,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
 static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
 {
        struct inode * inode;
-       int err = -EMLINK;
-
-       if (dir->i_nlink >= UFS_LINK_MAX)
-               goto out;
+       int err;
 
        lock_ufs(dir->i_sb);
        inode_inc_link_count(dir);
@@ -305,11 +298,6 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        drop_nlink(new_inode);
                inode_dec_link_count(new_inode);
        } else {
-               if (dir_de) {
-                       err = -EMLINK;
-                       if (new_dir->i_nlink >= UFS_LINK_MAX)
-                               goto out_dir;
-               }
                err = ufs_add_link(new_dentry, old_inode);
                if (err)
                        goto out_dir;