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

Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "Assorted commits that had missed the last merge window..."

* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  remove call_{read,write}_iter() functions
  do_dentry_open(): kill inode argument
  kernel_file_open(): get rid of inode argument
  get_file_rcu(): no need to check for NULL separately
  fd_is_open(): move to fs/file.c
  close_on_exec(): pass files_struct instead of fdtable
parents 3413efa8 7c98f7cb

drivers/block/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -445,9 +445,9 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, 
	cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0);



	if (rw == ITER_SOURCE)

		ret = call_write_iter(file, &cmd->iocb, &iter);

		ret = file->f_op->write_iter(&cmd->iocb, &iter);

	else

		ret = call_read_iter(file, &cmd->iocb, &iter);

		ret = file->f_op->read_iter(&cmd->iocb, &iter);



	lo_rw_aio_do_completion(cmd);

drivers/target/target_core_file.c

+2 −2
Original line number Diff line number Diff line
@@ -299,9 +299,9 @@ fd_execute_rw_aio(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, 
		aio_cmd->iocb.ki_flags |= IOCB_DSYNC;



	if (is_write)

		ret = call_write_iter(file, &aio_cmd->iocb, &iter);

		ret = file->f_op->write_iter(&aio_cmd->iocb, &iter);

	else

		ret = call_read_iter(file, &aio_cmd->iocb, &iter);

		ret = file->f_op->read_iter(&aio_cmd->iocb, &iter);



	if (ret != -EIOCBQUEUED)

		cmd_rw_aio_complete(&aio_cmd->iocb, ret);

fs/aio.c

+2 −2
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static int aio_read(struct kiocb *req, const struct iocb *iocb, 
		return ret;

	ret = rw_verify_area(READ, file, &req->ki_pos, iov_iter_count(&iter));

	if (!ret)

		aio_rw_done(req, call_read_iter(file, req, &iter));

		aio_rw_done(req, file->f_op->read_iter(req, &iter));

	kfree(iovec);

	return ret;

}
@@ -1639,7 +1639,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb, 
		if (S_ISREG(file_inode(file)->i_mode))

			kiocb_start_write(req);

		req->ki_flags |= IOCB_WRITE;

		aio_rw_done(req, call_write_iter(file, req, &iter));

		aio_rw_done(req, file->f_op->write_iter(req, &iter));

	}

	kfree(iovec);

	return ret;

fs/cachefiles/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -563,8 +563,7 @@ static bool cachefiles_open_file(struct cachefiles_object *object, 
	 */

	path.mnt = cache->mnt;

	path.dentry = dentry;

	file = kernel_file_open(&path, O_RDWR | O_LARGEFILE | O_DIRECT,

				d_backing_inode(dentry), cache->cache_cred);

	file = kernel_file_open(&path, O_RDWR | O_LARGEFILE | O_DIRECT, cache->cache_cred);

	if (IS_ERR(file)) {

		trace_cachefiles_vfs_error(object, d_backing_inode(dentry),

					   PTR_ERR(file),

fs/file.c

+8 −11
Original line number Diff line number Diff line
@@ -271,6 +271,11 @@ static inline void __clear_open_fd(unsigned int fd, struct fdtable *fdt) 
	__clear_bit(fd / BITS_PER_LONG, fdt->full_fds_bits);

}



static inline bool fd_is_open(unsigned int fd, const struct fdtable *fdt)

{

	return test_bit(fd, fdt->open_fds);

}



static unsigned int count_open_files(struct fdtable *fdt)

{

	unsigned int size = fdt->max_fds;
@@ -915,12 +920,7 @@ struct file *get_file_rcu(struct file __rcu **f) 
		struct file __rcu *file;



		file = __get_file_rcu(f);

		if (unlikely(!file))

			return NULL;



		if (unlikely(IS_ERR(file)))

			continue;



		if (!IS_ERR(file))

			return file;

	}

}
@@ -1219,12 +1219,9 @@ void set_close_on_exec(unsigned int fd, int flag) 


bool get_close_on_exec(unsigned int fd)

{

	struct files_struct *files = current->files;

	struct fdtable *fdt;

	bool res;

	rcu_read_lock();

	fdt = files_fdtable(files);

	res = close_on_exec(fd, fdt);

	res = close_on_exec(fd, current->files);

	rcu_read_unlock();

	return res;

}