From: adilger <adilger>
Date: Thu, 17 Oct 2002 23:04:58 +0000 (+0000)
Subject: Fix merge error.
X-Git-Tag: 0.5.15~94
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=26ee6c566a0489ee110401ae193123bbd2b3983b;p=fs%2Flustre-release.git

Fix merge error.
---

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index fb92b23..24b66ac 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -643,7 +643,7 @@ static int ll_common_unlink(struct inode *dir, struct dentry *dentry,__u32 mode)
         if (rc)
                 GOTO(out, rc);
 
-        err = ext2_delete_entry(de, page);
+        rc = ext2_delete_entry(de, page);
         if (err)
                 goto out;