diff --git a/[refs] b/[refs]
index 6d50661c590f..41058d00799b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9043476f726802f4b00c96d0c4f418dde48d1304
+refs/heads/master: 1bd5191d9f5d1928c4efdf604c4164b04bb88dbe
diff --git a/trunk/fs/hpfs/namei.c b/trunk/fs/hpfs/namei.c
index d256559b4104..d9c59a775449 100644
--- a/trunk/fs/hpfs/namei.c
+++ b/trunk/fs/hpfs/namei.c
@@ -415,7 +415,7 @@ static int hpfs_unlink(struct inode *dir, struct dentry *dentry)
 		d_drop(dentry);
 		spin_lock(&dentry->d_lock);
 		if (atomic_read(&dentry->d_count) > 1 ||
-		    permission(inode, MAY_WRITE, NULL) ||
+		    generic_permission(inode, MAY_WRITE, NULL) ||
 		    !S_ISREG(inode->i_mode) ||
 		    get_write_access(inode)) {
 			spin_unlock(&dentry->d_lock);