Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22c6186e authored by Omar Sandoval's avatar Omar Sandoval Committed by Al Viro
Browse files

direct_IO: remove rw from a_ops->direct_IO() 



Now that no one is using rw, remove it completely.

Signed-off-by: default avatarOmar Sandoval <osandov@osandov.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6f673763

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ prototypes: 
	void (*invalidatepage) (struct page *, unsigned int, unsigned int);

	int (*releasepage) (struct page *, int);

	void (*freepage)(struct page *);

	int (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);

	int (*direct_IO)(struct kiocb *, struct iov_iter *iter, loff_t offset);

	int (*migratepage)(struct address_space *, struct page *, struct page *);

	int (*launder_page)(struct page *);

	int (*is_partially_uptodate)(struct page *, unsigned long, unsigned long);

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ struct address_space_operations { 
	void (*invalidatepage) (struct page *, unsigned int, unsigned int);

	int (*releasepage) (struct page *, int);

	void (*freepage)(struct page *);

	ssize_t (*direct_IO)(int, struct kiocb *, struct iov_iter *iter, loff_t offset);

	ssize_t (*direct_IO)(struct kiocb *, struct iov_iter *iter, loff_t offset);

	/* migrate the contents of a page to the specified target */

	int (*migratepage) (struct page *, struct page *);

	int (*launder_page) (struct page *);

drivers/staging/lustre/lustre/llite/rw26.c

+2 −2
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io, 
 * up to 22MB for 128kB kmalloc and up to 682MB for 4MB kmalloc. */

#define MAX_DIO_SIZE ((MAX_MALLOC / sizeof(struct brw_page) * PAGE_CACHE_SIZE) & \

		      ~(DT_MAX_BRW_SIZE - 1))

static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,

			       struct iov_iter *iter, loff_t file_offset)

static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,

			       loff_t file_offset)

{

	struct lu_env *env;

	struct cl_io *io;

fs/9p/vfs_addr.c

+1 −2
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ static int v9fs_launder_page(struct page *page) 


/**

 * v9fs_direct_IO - 9P address space operation for direct I/O

 * @rw: direction (read or write)

 * @iocb: target I/O control block

 * @iov: array of vectors that define I/O buffer

 * @pos: offset in file to begin the operation
@@ -248,7 +247,7 @@ static int v9fs_launder_page(struct page *page) 
 *

 */

static ssize_t

v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos)

v9fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t pos)

{

	struct file *file = iocb->ki_filp;

	ssize_t n;

fs/affs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -389,8 +389,7 @@ static void affs_write_failed(struct address_space *mapping, loff_t to) 
}



static ssize_t

affs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,

	       loff_t offset)

affs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)

{

	struct file *file = iocb->ki_filp;

	struct address_space *mapping = file->f_mapping;