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

Commit 9bf12df3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kvack.org/~bcrl/aio-next 

Pull aio changes from Ben LaHaise:
 "First off, sorry for this pull request being late in the merge window.
  Al had raised a couple of concerns about 2 items in the series below.
  I addressed the first issue (the race introduced by Gu's use of
  mm_populate()), but he has not provided any further details on how he
  wants to rework the anon_inode.c changes (which were sent out months
  ago but have yet to be commented on).

  The bulk of the changes have been sitting in the -next tree for a few
  months, with all the issues raised being addressed"

* git://git.kvack.org/~bcrl/aio-next: (22 commits)
  aio: rcu_read_lock protection for new rcu_dereference calls
  aio: fix race in ring buffer page lookup introduced by page migration support
  aio: fix rcu sparse warnings introduced by ioctx table lookup patch
  aio: remove unnecessary debugging from aio_free_ring()
  aio: table lookup: verify ctx pointer
  staging/lustre: kiocb->ki_left is removed
  aio: fix error handling and rcu usage in "convert the ioctx list to table lookup v3"
  aio: be defensive to ensure request batching is non-zero instead of BUG_ON()
  aio: convert the ioctx list to table lookup v3
  aio: double aio_max_nr in calculations
  aio: Kill ki_dtor
  aio: Kill ki_users
  aio: Kill unneeded kiocb members
  aio: Kill aio_rw_vect_retry()
  aio: Don't use ctx->tail unnecessarily
  aio: io_cancel() no longer returns the io_event
  aio: percpu ioctx refcount
  aio: percpu reqs_available
  aio: reqs_active -> reqs_available
  aio: fix build when migration is disabled
  ...
parents 399a946e d9b2c871

drivers/staging/android/logger.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	header.sec = now.tv_sec;

	header.nsec = now.tv_nsec;

	header.euid = current_euid();

	header.len = min_t(size_t, iocb->ki_left, LOGGER_ENTRY_MAX_PAYLOAD);

	header.len = min_t(size_t, iocb->ki_nbytes, LOGGER_ENTRY_MAX_PAYLOAD);

	header.hdr_size = sizeof(struct logger_entry);



	/* null writes succeed, return zero */

drivers/staging/lustre/lustre/llite/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ static ssize_t ll_file_read(struct file *file, char *buf, size_t count, 
	local_iov->iov_len = count;

	init_sync_kiocb(kiocb, file);

	kiocb->ki_pos = *ppos;

	kiocb->ki_left = count;

	kiocb->ki_nbytes = count;



	result = ll_file_aio_read(kiocb, local_iov, 1, kiocb->ki_pos);

	*ppos = kiocb->ki_pos;
@@ -1068,7 +1068,7 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count, 
	local_iov->iov_len = count;

	init_sync_kiocb(kiocb, file);

	kiocb->ki_pos = *ppos;

	kiocb->ki_left = count;

	kiocb->ki_nbytes = count;



	result = ll_file_aio_write(kiocb, local_iov, 1, kiocb->ki_pos);

	*ppos = kiocb->ki_pos;

drivers/usb/gadget/inode.c

+4 −5
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ struct kiocb_priv { 
	unsigned		actual;

};



static int ep_aio_cancel(struct kiocb *iocb, struct io_event *e)

static int ep_aio_cancel(struct kiocb *iocb)

{

	struct kiocb_priv	*priv = iocb->private;

	struct ep_data		*epdata;
@@ -540,7 +540,6 @@ static int ep_aio_cancel(struct kiocb *iocb, struct io_event *e) 
	// spin_unlock(&epdata->dev->lock);

	local_irq_enable();



	aio_put_req(iocb);

	return value;

}
@@ -709,11 +708,11 @@ ep_aio_read(struct kiocb *iocb, const struct iovec *iov, 
	if (unlikely(usb_endpoint_dir_in(&epdata->desc)))

		return -EINVAL;



	buf = kmalloc(iocb->ki_left, GFP_KERNEL);

	buf = kmalloc(iocb->ki_nbytes, GFP_KERNEL);

	if (unlikely(!buf))

		return -ENOMEM;



	return ep_aio_rwtail(iocb, buf, iocb->ki_left, epdata, iov, nr_segs);

	return ep_aio_rwtail(iocb, buf, iocb->ki_nbytes, epdata, iov, nr_segs);

}



static ssize_t
@@ -728,7 +727,7 @@ ep_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	if (unlikely(!usb_endpoint_dir_in(&epdata->desc)))

		return -EINVAL;



	buf = kmalloc(iocb->ki_left, GFP_KERNEL);

	buf = kmalloc(iocb->ki_nbytes, GFP_KERNEL);

	if (unlikely(!buf))

		return -ENOMEM;