Merge tag 'write-page-prefaulting' of git://git.kernel.org/pub/scm/linux/kernel/git...

[uclinux-h8/linux.git] / fs / fcntl.c

diff --git a/fs/fcntl.c b/fs/fcntl.c
index 9c6c6a3..f15d885 100644 (file)
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -291,22 +291,6 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
        u64 h;
 
        switch (cmd) {
-       case F_GET_FILE_RW_HINT:
-               h = file_write_hint(file);
-               if (copy_to_user(argp, &h, sizeof(*argp)))
-                       return -EFAULT;
-               return 0;
-       case F_SET_FILE_RW_HINT:
-               if (copy_from_user(&h, argp, sizeof(h)))
-                       return -EFAULT;
-               hint = (enum rw_hint) h;
-               if (!rw_hint_valid(hint))
-                       return -EINVAL;
-
-               spin_lock(&file->f_lock);
-               file->f_write_hint = hint;
-               spin_unlock(&file->f_lock);
-               return 0;
        case F_GET_RW_HINT:
                h = inode->i_write_hint;
                if (copy_to_user(argp, &h, sizeof(*argp)))
@@ -431,8 +415,6 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
                break;
        case F_GET_RW_HINT:
        case F_SET_RW_HINT:
-       case F_GET_FILE_RW_HINT:
-       case F_SET_FILE_RW_HINT:
                err = fcntl_rw_hint(filp, cmd, arg);
                break;
        default: