diff --git a/[refs] b/[refs]
index 283211c6d9f3..a3f469962d30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55ad63bf3a30936aced50f13452735c2f58b234c
+refs/heads/master: 2c94eb86c66e1eaaa1e7d8a2120f4fad5e7e7736
diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c
index fea14dbd3c22..ba91bd0f7916 100644
--- a/trunk/fs/ext4/namei.c
+++ b/trunk/fs/ext4/namei.c
@@ -2421,7 +2421,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
 			goto end_rename;
 		retval = -EMLINK;
 		if (!new_inode && new_dir != old_dir &&
-				new_dir->i_nlink >= EXT4_LINK_MAX)
+		    EXT4_DIR_LINK_MAX(new_dir))
 			goto end_rename;
 	}
 	if (!new_bh) {