Skip to content

Commit

Permalink
kill fs/read_write.h
Browse files Browse the repository at this point in the history
fs/compat.c doesn't need it anymore, so let's just move the remaining
contents (two typedefs) into fs/read_write.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed May 4, 2013
1 parent 5ae98f1 commit c0bd14a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
2 changes: 0 additions & 2 deletions fs/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ int compat_printk(const char *fmt, ...)
return ret;
}

#include "read_write.h"

/*
* Not all architectures have sys_utime, so implement this in terms
* of sys_utimes.
Expand Down
5 changes: 4 additions & 1 deletion fs/read_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
#include <linux/pagemap.h>
#include <linux/splice.h>
#include <linux/compat.h>
#include "read_write.h"
#include "internal.h"

#include <asm/uaccess.h>
#include <asm/unistd.h>

typedef ssize_t (*io_fn_t)(struct file *, char __user *, size_t, loff_t *);
typedef ssize_t (*iov_fn_t)(struct kiocb *, const struct iovec *,
unsigned long, loff_t);

const struct file_operations generic_ro_fops = {
.llseek = generic_file_llseek,
.read = do_sync_read,
Expand Down
9 changes: 0 additions & 9 deletions fs/read_write.h

This file was deleted.

0 comments on commit c0bd14a

Please sign in to comment.