Commit b2403a61 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

fs, net: Move read_descriptor_t to net.h 



fs.h has no more need for this typedef; networking is now the sole user
of the read_descriptor_t.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a9fcd89d

include/linux/fs.h

+0 −19
Original line number Diff line number Diff line
@@ -338,25 +338,6 @@ static inline bool is_sync_kiocb(struct kiocb *kiocb) 
	return kiocb->ki_complete == NULL;

}



/*

 * "descriptor" for what we're up to with a read.

 * This allows us to use the same read code yet

 * have multiple different users of the data that

 * we read from a file.

 *

 * The simplest case just copies the data to user

 * mode.

 */

typedef struct {

	size_t written;

	size_t count;

	union {

		char __user *buf;

		void *data;

	} arg;

	int error;

} read_descriptor_t;



struct address_space_operations {

	int (*writepage)(struct page *page, struct writeback_control *wbc);

	int (*readpage)(struct file *, struct page *);

include/linux/net.h

+19 −0
Original line number Diff line number Diff line
@@ -125,6 +125,25 @@ struct socket { 
	struct socket_wq	wq;

};



/*

 * "descriptor" for what we're up to with a read.

 * This allows us to use the same read code yet

 * have multiple different users of the data that

 * we read from a file.

 *

 * The simplest case just copies the data to user

 * mode.

 */

typedef struct {

	size_t written;

	size_t count;

	union {

		char __user *buf;

		void *data;

	} arg;

	int error;

} read_descriptor_t;



struct vm_area_struct;

struct page;

struct sockaddr;