->permission() sanitizing: don't pass flags to generic_permission()

[uclinux-h8/linux.git] / fs / hostfs / hostfs_kern.c

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index e6816b9..b1bc31b 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -683,8 +683,6 @@ int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
        char *file;
        int err;
 
-       dentry_unhash(dentry);
-
        if ((file = dentry_name(dentry)) == NULL)
                return -ENOMEM;
        err = do_rmdir(file);
@@ -738,9 +736,6 @@ int hostfs_rename(struct inode *from_ino, struct dentry *from,
        char *from_name, *to_name;
        int err;
 
-       if (to->d_inode && S_ISDIR(to->d_inode->i_mode))
-               dentry_unhash(to);
-
        if ((from_name = dentry_name(from)) == NULL)
                return -ENOMEM;
        if ((to_name = dentry_name(to)) == NULL) {
@@ -775,7 +770,7 @@ int hostfs_permission(struct inode *ino, int desired, unsigned int flags)
                err = access_file(name, r, w, x);
        __putname(name);
        if (!err)
-               err = generic_permission(ino, desired, flags, NULL);
+               err = generic_permission(ino, desired);
        return err;
 }