From 0720a82be77475fe4fef1f1a7d53097a18c84989 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Wed, 9 Aug 2006 11:45:07 -0700 Subject: [PATCH] --- yaml --- r: 34267 b: refs/heads/master c: a663e30513d7ecc77dd71d474e7646bf78c0ba62 h: refs/heads/master i: 34265: b9e07fec3a2b85e4872fa29d5349fce57d438b9e 34263: 2f9a9c6e946ad11066abfb88867874bca68effa5 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/namei.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5a349044e062..971763a49a3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 471e3f57286da7ce8820ad42c77d5f5f49d56a41 +refs/heads/master: a663e30513d7ecc77dd71d474e7646bf78c0ba62 diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c index 0673862c8bdd..d8161a77c370 100644 --- a/trunk/fs/ocfs2/namei.c +++ b/trunk/fs/ocfs2/namei.c @@ -310,13 +310,6 @@ static int ocfs2_mknod(struct inode *dir, /* get our super block */ osb = OCFS2_SB(dir->i_sb); - if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) { - mlog(ML_ERROR, "inode %llu has i_nlink of %u\n", - (unsigned long long)OCFS2_I(dir)->ip_blkno, dir->i_nlink); - status = -EMLINK; - goto leave; - } - handle = ocfs2_alloc_handle(osb); if (handle == NULL) { status = -ENOMEM; @@ -331,6 +324,11 @@ static int ocfs2_mknod(struct inode *dir, goto leave; } + if (S_ISDIR(mode) && (dir->i_nlink >= OCFS2_LINK_MAX)) { + status = -EMLINK; + goto leave; + } + dirfe = (struct ocfs2_dinode *) parent_fe_bh->b_data; if (!dirfe->i_links_count) { /* can't make a file in a deleted directory. */