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

Commit c2e7b207 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs cleanups from Al Viro:
 "More cleanups from Christoph"

* 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  nfsd: use RWF_SYNC
  fs: add RWF_DSYNC aand RWF_SYNC
  ceph: use generic_write_sync
  fs: simplify the generic_write_sync prototype
  fs: add IOCB_SYNC and IOCB_DSYNC
  direct-io: remove the offset argument to dio_complete
  direct-io: eliminate the offset argument to ->direct_IO
  xfs: eliminate the pos variable in xfs_file_dio_aio_write
  filemap: remove the pos argument to generic_file_direct_write
  filemap: remove pos variables in generic_file_read_iter
parents c52b7618 24368aad

Documentation/filesystems/Locking

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

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

	void (*freepage)(struct page *);

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

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

	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
@@ -591,7 +591,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)(struct kiocb *, struct iov_iter *iter, loff_t offset);

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

	/* 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
@@ -358,14 +358,14 @@ static ssize_t ll_direct_IO_26_seg(const struct lu_env *env, struct cl_io *io, 
 */

#define MAX_DIO_SIZE ((KMALLOC_MAX_SIZE / sizeof(struct brw_page) *	  \

		       PAGE_SIZE) & ~(DT_MAX_BRW_SIZE - 1))

static ssize_t ll_direct_IO_26(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)

{

	struct lu_env *env;

	struct cl_io *io;

	struct file *file = iocb->ki_filp;

	struct inode *inode = file->f_mapping->host;

	struct ccc_object *obj = cl_inode2ccc(inode);

	loff_t file_offset = iocb->ki_pos;

	ssize_t count = iov_iter_count(iter);

	ssize_t tot_bytes = 0, result = 0;

	struct ll_inode_info *lli = ll_i2info(inode);

fs/9p/vfs_addr.c

+2 −1
Original line number Diff line number Diff line
@@ -245,9 +245,10 @@ static int v9fs_launder_page(struct page *page) 
 *

 */

static ssize_t

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

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

{

	struct file *file = iocb->ki_filp;

	loff_t pos = iocb->ki_pos;

	ssize_t n;

	int err = 0;

	if (iov_iter_rw(iter) == WRITE) {

fs/affs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -389,12 +389,13 @@ static void affs_write_failed(struct address_space *mapping, loff_t to) 
}



static ssize_t

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

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

{

	struct file *file = iocb->ki_filp;

	struct address_space *mapping = file->f_mapping;

	struct inode *inode = mapping->host;

	size_t count = iov_iter_count(iter);

	loff_t offset = iocb->ki_pos;

	ssize_t ret;



	if (iov_iter_rw(iter) == WRITE) {
@@ -404,7 +405,7 @@ affs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset) 
			return 0;

	}



	ret = blockdev_direct_IO(iocb, inode, iter, offset, affs_get_block);

	ret = blockdev_direct_IO(iocb, inode, iter, affs_get_block);

	if (ret < 0 && iov_iter_rw(iter) == WRITE)

		affs_write_failed(mapping, offset + count);

	return ret;