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

Commit da9cbc87 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: blkdev.h cleanup, move iocontext stuff to iocontext.h 



Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent b984679e

include/linux/blkdev.h

+0 −17
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@ struct sg_io_hdr; 
#define BLKDEV_MIN_RQ	4

#define BLKDEV_MAX_RQ	128	/* Default maximum */



int put_io_context(struct io_context *ioc);

void exit_io_context(void);

struct io_context *get_io_context(gfp_t gfp_flags, int node);

struct io_context *alloc_io_context(gfp_t gfp_flags, int node);

void copy_io_context(struct io_context **pdst, struct io_context **psrc);



struct request;

typedef void (rq_end_io_fn)(struct request *, int);
@@ -981,17 +975,6 @@ static inline long nr_blockdev_pages(void) 
	return 0;

}



static inline void exit_io_context(void)

{

}



struct io_context;

static inline int put_io_context(struct io_context *ioc)

{

	return 1;

}





#endif /* CONFIG_BLOCK */



#endif

include/linux/iocontext.h

+18 −0
Original line number Diff line number Diff line
@@ -99,4 +99,22 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc) 
	return NULL;

}



#ifdef CONFIG_BLOCK

int put_io_context(struct io_context *ioc);

void exit_io_context(void);

struct io_context *get_io_context(gfp_t gfp_flags, int node);

struct io_context *alloc_io_context(gfp_t gfp_flags, int node);

void copy_io_context(struct io_context **pdst, struct io_context **psrc);

#else

static inline void exit_io_context(void)

{

}



struct io_context;

static inline int put_io_context(struct io_context *ioc)

{

	return 1;

}

#endif



#endif

kernel/exit.c

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

#include <linux/tty.h>

#include <linux/mnt_namespace.h>

#include <linux/iocontext.h>

#include <linux/key.h>

#include <linux/security.h>

#include <linux/cpu.h>

kernel/fork.c

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

#include <linux/file.h>

#include <linux/fdtable.h>

#include <linux/iocontext.h>

#include <linux/key.h>

#include <linux/binfmts.h>

#include <linux/mman.h>