3 files changed, 5 insertions, 16 deletions

diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c
index 80405836ba6e..c61e62ac231c 100644
--- a/fs/exofs/dir.c
+++ b/fs/exofs/dir.c
@@ -597,7 +597,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent)
                 goto fail;
         }
 
-        kaddr = kmap_atomic(page, KM_USER0);
+        kaddr = kmap_atomic(page);
         de = (struct exofs_dir_entry *)kaddr;
         de->name_len = 1;
         de->rec_len = cpu_to_le16(EXOFS_DIR_REC_LEN(1));
@@ -611,7 +611,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent)
         de->inode_no = cpu_to_le64(parent->i_ino);
         memcpy(de->name, PARENT_DIR, sizeof(PARENT_DIR));
         exofs_set_de_type(de, inode);
-        kunmap_atomic(kaddr, KM_USER0);
+        kunmap_atomic(kaddr);
         err = exofs_commit_chunk(page, 0, chunk_size);
 fail:
         page_cache_release(page);
diff --git a/fs/exofs/namei.c b/fs/exofs/namei.c
index 9dbf0c301030..fc7161d6bf6b 100644
--- a/fs/exofs/namei.c
+++ b/fs/exofs/namei.c
@@ -143,9 +143,6 @@ static int exofs_link(struct dentry *old_dentry, struct inode *dir,
 {
         struct inode *inode = old_dentry->d_inode;
 
-        if (inode->i_nlink >= EXOFS_LINK_MAX)
-                return -EMLINK;
-
         inode->i_ctime = CURRENT_TIME;
         inode_inc_link_count(inode);
         ihold(inode);
@@ -156,10 +153,7 @@ static int exofs_link(struct dentry *old_dentry, struct inode *dir,
 static int exofs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 {
         struct inode *inode;
-        int err = -EMLINK;
-
-        if (dir->i_nlink >= EXOFS_LINK_MAX)
-                goto out;
+        int err;
 
         inode_inc_link_count(dir);
 
@@ -275,11 +269,6 @@ static int exofs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 if (err)
                         goto out_dir;
         } else {
-                if (dir_de) {
-                        err = -EMLINK;
-                        if (new_dir->i_nlink >= EXOFS_LINK_MAX)
-                                goto out_dir;
-                }
                 err = exofs_add_link(new_dentry, old_inode);
                 if (err)
                         goto out_dir;
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 6c5397ad7a2a..735ca06430ac 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -755,6 +755,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_blocksize = EXOFS_BLKSIZE;
         sb->s_blocksize_bits = EXOFS_BLKSHIFT;
         sb->s_maxbytes = MAX_LFS_FILESIZE;
+        sb->s_max_links = EXOFS_LINK_MAX;
         atomic_set(&sbi->s_curr_pending, 0);
         sb->s_bdev = NULL;
         sb->s_dev = 0;
@@ -819,9 +820,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
                 ret = PTR_ERR(root);
                 goto free_sbi;
         }
-        sb->s_root = d_alloc_root(root);
+        sb->s_root = d_make_root(root);
         if (!sb->s_root) {
-                iput(root);
                 EXOFS_ERR("ERROR: get root inode failed\n");
                 ret = -ENOMEM;
                 goto free_sbi;