Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[karo-tx-linux.git] / fs / jfs / namei.c

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 5f7c160ea64f93a56ad61bf217125d2943d77009..07c91ca6017db03d404362e5e763fdbf90fdc2ef 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -220,12 +220,6 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
 
        dquot_initialize(dip);
 
-       /* link count overflow on parent directory ? */
-       if (dip->i_nlink == JFS_LINK_MAX) {
-               rc = -EMLINK;
-               goto out1;
-       }
-
        /*
         * search parent directory for entry/freespace
         * (dtSearch() returns parent directory page pinned)
@@ -806,9 +800,6 @@ static int jfs_link(struct dentry *old_dentry,
        jfs_info("jfs_link: %s %s", old_dentry->d_name.name,
                 dentry->d_name.name);
 
-       if (ip->i_nlink == JFS_LINK_MAX)
-               return -EMLINK;
-
        dquot_initialize(dir);
 
        tid = txBegin(ip->i_sb, 0);
@@ -1138,10 +1129,6 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                                rc = -ENOTEMPTY;
                                goto out3;
                        }
-               } else if ((new_dir != old_dir) &&
-                          (new_dir->i_nlink == JFS_LINK_MAX)) {
-                       rc = -EMLINK;
-                       goto out3;
                }
        } else if (new_ip) {
                IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL);