Merge with 2.1.47. Some more cleanup and module fixes.

1 files changed, 6 insertions, 29 deletions

diff --git a/fs/open.c b/fs/open.c
index 3408fb2a6..36669e4a6 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -543,44 +543,21 @@ out:
 	return error;
 }
 
-asmlinkage int sys_lchown(const char * filename, uid_t user, gid_t group)
-{
-	struct dentry * dentry;
-	int error;
-
-	lock_kernel();
-	dentry = lnamei(filename);
-
-	error = PTR_ERR(dentry);
-	if (IS_ERR(dentry))
-		goto out;
-
-	error = chown_common(dentry, user, group);
-
-	dput(dentry);
-out:
-	unlock_kernel();
-	return(error);
-}
-
 asmlinkage int sys_chown(const char * filename, uid_t user, gid_t group)
 {
 	struct dentry * dentry;
 	int error;
 
 	lock_kernel();
-	dentry = namei(filename);
+	dentry = lnamei(filename);
 
 	error = PTR_ERR(dentry);
-	if (IS_ERR(dentry))
-		goto out;
-
-	error = chown_common(dentry, user, group);
-
-	dput(dentry);
-out:
+	if (!IS_ERR(dentry)) {
+		error = chown_common(dentry, user, group);
+		dput(dentry);
+	}
 	unlock_kernel();
-	return(error);
+	return error;
 }
 
 asmlinkage int sys_fchown(unsigned int fd, uid_t user, gid_t group)