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

Commit 4e179bca authored by Kent Overstreet's avatar Kent Overstreet Committed by Linus Torvalds
Browse files

aio: move private stuff out of aio.h 



Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
Cc: Zach Brown <zab@redhat.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Asai Thambi S P <asamymuthupa@micron.com>
Cc: Selvan Mani <smani@micron.com>
Cc: Sam Bradshaw <sbradshaw@micron.com>
Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 906b973c

drivers/usb/gadget/inode.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/poll.h>

#include <linux/poll.h>

#include <linux/mmu_context.h>

#include <linux/mmu_context.h>

#include <linux/aio.h>





#include <linux/device.h>

#include <linux/device.h>

#include <linux/moduleparam.h>

#include <linux/moduleparam.h>

fs/aio.c

+61 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,67 @@ 
#define dprintk(x...)	do { ; } while (0)

#define dprintk(x...)	do { ; } while (0)

#endif

#endif





#define AIO_RING_MAGIC			0xa10a10a1

#define AIO_RING_COMPAT_FEATURES	1

#define AIO_RING_INCOMPAT_FEATURES	0

struct aio_ring {

	unsigned	id;	/* kernel internal index number */

	unsigned	nr;	/* number of io_events */

	unsigned	head;

	unsigned	tail;



	unsigned	magic;

	unsigned	compat_features;

	unsigned	incompat_features;

	unsigned	header_length;	/* size of aio_ring */





	struct io_event		io_events[0];

}; /* 128 bytes + ring size */



#define AIO_RING_PAGES	8

struct aio_ring_info {

	unsigned long		mmap_base;

	unsigned long		mmap_size;



	struct page		**ring_pages;

	spinlock_t		ring_lock;

	long			nr_pages;



	unsigned		nr, tail;



	struct page		*internal_pages[AIO_RING_PAGES];

};



static inline unsigned aio_ring_avail(struct aio_ring_info *info,

					struct aio_ring *ring)

{

	return (ring->head + info->nr - 1 - ring->tail) % info->nr;

}



struct kioctx {

	atomic_t		users;

	int			dead;



	/* This needs improving */

	unsigned long		user_id;

	struct hlist_node	list;



	wait_queue_head_t	wait;



	spinlock_t		ctx_lock;



	int			reqs_active;

	struct list_head	active_reqs;	/* used for cancellation */



	/* sys_io_setup currently limits this to an unsigned int */

	unsigned		max_reqs;



	struct aio_ring_info	ring_info;



	struct rcu_head		rcu_head;

};



/*------ sysctl variables----*/

/*------ sysctl variables----*/

static DEFINE_SPINLOCK(aio_nr_lock);

static DEFINE_SPINLOCK(aio_nr_lock);

unsigned long aio_nr;		/* current system wide number of aio requests */

unsigned long aio_nr;		/* current system wide number of aio requests */

include/linux/aio.h

+0 −61
Original line number Original line Diff line number Diff line
@@ -103,67 +103,6 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp) 
		};

		};

}

}





#define AIO_RING_MAGIC			0xa10a10a1

#define AIO_RING_COMPAT_FEATURES	1

#define AIO_RING_INCOMPAT_FEATURES	0

struct aio_ring {

	unsigned	id;	/* kernel internal index number */

	unsigned	nr;	/* number of io_events */

	unsigned	head;

	unsigned	tail;



	unsigned	magic;

	unsigned	compat_features;

	unsigned	incompat_features;

	unsigned	header_length;	/* size of aio_ring */





	struct io_event		io_events[0];

}; /* 128 bytes + ring size */



#define AIO_RING_PAGES	8

struct aio_ring_info {

	unsigned long		mmap_base;

	unsigned long		mmap_size;



	struct page		**ring_pages;

	spinlock_t		ring_lock;

	long			nr_pages;



	unsigned		nr, tail;



	struct page		*internal_pages[AIO_RING_PAGES];

};



static inline unsigned aio_ring_avail(struct aio_ring_info *info,

					struct aio_ring *ring)

{

	return (ring->head + info->nr - 1 - ring->tail) % info->nr;

}



struct kioctx {

	atomic_t		users;

	int			dead;



	/* This needs improving */

	unsigned long		user_id;

	struct hlist_node	list;



	wait_queue_head_t	wait;



	spinlock_t		ctx_lock;



	int			reqs_active;

	struct list_head	active_reqs;	/* used for cancellation */



	/* sys_io_setup currently limits this to an unsigned int */

	unsigned		max_reqs;



	struct aio_ring_info	ring_info;



	struct rcu_head		rcu_head;

};



/* prototypes */

/* prototypes */

#ifdef CONFIG_AIO

#ifdef CONFIG_AIO

extern ssize_t wait_on_sync_kiocb(struct kiocb *iocb);

extern ssize_t wait_on_sync_kiocb(struct kiocb *iocb);