From 0960e1ddc44e6bb2ff0240c923bff7759cd7845f Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Fri, 28 Aug 2009 21:43:15 -0400
Subject: [PATCH] --- yaml --- r: 163658 b: refs/heads/master c:
 2c94eb86c66e1eaaa1e7d8a2120f4fad5e7e7736 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/namei.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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) {