From 1b8d9a93e45a75f34a7b2cc4f937103c65c63ead Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 6 Jun 2010 23:19:04 -0400
Subject: [PATCH] --- yaml --- r: 207564 b: refs/heads/master c:
 f8d7e1877e5121841bc9a4d284a04dbc13f45bea h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/hostfs/hostfs_kern.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0d9532d3ac61..c5810c2f810d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9193059b1b3733695d5b80e667778311695aa73
+refs/heads/master: f8d7e1877e5121841bc9a4d284a04dbc13f45bea
diff --git a/trunk/fs/hostfs/hostfs_kern.c b/trunk/fs/hostfs/hostfs_kern.c
index 79783a0b2f4d..8130ce93a06a 100644
--- a/trunk/fs/hostfs/hostfs_kern.c
+++ b/trunk/fs/hostfs/hostfs_kern.c
@@ -622,11 +622,12 @@ int hostfs_unlink(struct inode *ino, struct dentry *dentry)
 	char *file;
 	int err;
 
-	if ((file = dentry_name(dentry)) == NULL)
-		return -ENOMEM;
 	if (append)
 		return -EPERM;
 
+	if ((file = dentry_name(dentry)) == NULL)
+		return -ENOMEM;
+
 	err = unlink_file(file);
 	__putname(file);
 	return err;