From 26ee6c566a0489ee110401ae193123bbd2b3983b Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Thu, 17 Oct 2002 23:04:58 +0000
Subject: [PATCH] Fix merge error.

---
 lustre/llite/namei.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 
-- 
1.8.3.1