NFS: Create a common read and write data struct (9c7e1b3d) · Commits · e / devices / android_kernel_fairphone_FP3

fs/nfs/blocklayout/blocklayout.c

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -210,7 +210,7 @@ static void bl_end_io_read(struct bio *bio, int err)
	SetPageUptodate(bvec->bv_page);		SetPageUptodate(bvec->bv_page);

	if (err) {		if (err) {
	struct nfs_read_data *rdata = par->data;		struct nfs_pgio_data *rdata = par->data;
	struct nfs_pgio_header *header = rdata->header;		struct nfs_pgio_header *header = rdata->header;

	if (!header->pnfs_error)		if (!header->pnfs_error)
	@@ -224,17 +224,17 @@ static void bl_end_io_read(struct bio *bio, int err)
	static void bl_read_cleanup(struct work_struct *work)		static void bl_read_cleanup(struct work_struct *work)
	{		{
	struct rpc_task *task;		struct rpc_task *task;
	struct nfs_read_data *rdata;		struct nfs_pgio_data *rdata;
	dprintk("%s enter\n", __func__);		dprintk("%s enter\n", __func__);
	task = container_of(work, struct rpc_task, u.tk_work);		task = container_of(work, struct rpc_task, u.tk_work);
	rdata = container_of(task, struct nfs_read_data, task);		rdata = container_of(task, struct nfs_pgio_data, task);
	pnfs_ld_read_done(rdata);		pnfs_ld_read_done(rdata);
	}		}

	static void		static void
	bl_end_par_io_read(void *data, int unused)		bl_end_par_io_read(void *data, int unused)
	{		{
	struct nfs_read_data *rdata = data;		struct nfs_pgio_data *rdata = data;

	rdata->task.tk_status = rdata->header->pnfs_error;		rdata->task.tk_status = rdata->header->pnfs_error;
	INIT_WORK(&rdata->task.u.tk_work, bl_read_cleanup);		INIT_WORK(&rdata->task.u.tk_work, bl_read_cleanup);
	@@ -242,7 +242,7 @@ bl_end_par_io_read(void *data, int unused)
	}		}

	static enum pnfs_try_status		static enum pnfs_try_status
	bl_read_pagelist(struct nfs_read_data *rdata)		bl_read_pagelist(struct nfs_pgio_data *rdata)
	{		{
	struct nfs_pgio_header *header = rdata->header;		struct nfs_pgio_header *header = rdata->header;
	int i, hole;		int i, hole;
	@@ -390,7 +390,7 @@ static void bl_end_io_write_zero(struct bio *bio, int err)
	}		}

	if (unlikely(err)) {		if (unlikely(err)) {
	struct nfs_write_data *data = par->data;		struct nfs_pgio_data *data = par->data;
	struct nfs_pgio_header *header = data->header;		struct nfs_pgio_header *header = data->header;

	if (!header->pnfs_error)		if (!header->pnfs_error)
	@@ -405,7 +405,7 @@ static void bl_end_io_write(struct bio *bio, int err)
	{		{
	struct parallel_io *par = bio->bi_private;		struct parallel_io *par = bio->bi_private;
	const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);		const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
	struct nfs_write_data *data = par->data;		struct nfs_pgio_data *data = par->data;
	struct nfs_pgio_header *header = data->header;		struct nfs_pgio_header *header = data->header;

	if (!uptodate) {		if (!uptodate) {
	@@ -423,10 +423,10 @@ static void bl_end_io_write(struct bio *bio, int err)
	static void bl_write_cleanup(struct work_struct *work)		static void bl_write_cleanup(struct work_struct *work)
	{		{
	struct rpc_task *task;		struct rpc_task *task;
	struct nfs_write_data *wdata;		struct nfs_pgio_data *wdata;
	dprintk("%s enter\n", __func__);		dprintk("%s enter\n", __func__);
	task = container_of(work, struct rpc_task, u.tk_work);		task = container_of(work, struct rpc_task, u.tk_work);
	wdata = container_of(task, struct nfs_write_data, task);		wdata = container_of(task, struct nfs_pgio_data, task);
	if (likely(!wdata->header->pnfs_error)) {		if (likely(!wdata->header->pnfs_error)) {
	/* Marks for LAYOUTCOMMIT */		/* Marks for LAYOUTCOMMIT */
	mark_extents_written(BLK_LSEG2EXT(wdata->header->lseg),		mark_extents_written(BLK_LSEG2EXT(wdata->header->lseg),
	@@ -438,7 +438,7 @@ static void bl_write_cleanup(struct work_struct *work)
	/* Called when last of bios associated with a bl_write_pagelist call finishes */		/* Called when last of bios associated with a bl_write_pagelist call finishes */
	static void bl_end_par_io_write(void *data, int num_se)		static void bl_end_par_io_write(void *data, int num_se)
	{		{
	struct nfs_write_data *wdata = data;		struct nfs_pgio_data *wdata = data;

	if (unlikely(wdata->header->pnfs_error)) {		if (unlikely(wdata->header->pnfs_error)) {
	bl_free_short_extents(&BLK_LSEG2EXT(wdata->header->lseg)->bl_inval,		bl_free_short_extents(&BLK_LSEG2EXT(wdata->header->lseg)->bl_inval,
	@@ -673,7 +673,7 @@ bl_find_get_zeroing_page(struct inode *inode, pgoff_t index,
	}		}

	static enum pnfs_try_status		static enum pnfs_try_status
	bl_write_pagelist(struct nfs_write_data *wdata, int sync)		bl_write_pagelist(struct nfs_pgio_data *wdata, int sync)
	{		{
	struct nfs_pgio_header *header = wdata->header;		struct nfs_pgio_header *header = wdata->header;
	int i, ret, npg_zero, pg_index, last = 0;		int i, ret, npg_zero, pg_index, last = 0;

fs/nfs/internal.h

+5 −5

fs/nfs/nfs3proc.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -795,7 +795,7 @@ nfs3_proc_pathconf(struct nfs_server server, struct nfs_fh fhandle,
	return status;		return status;
	}		}

	static int nfs3_read_done(struct rpc_task task, struct nfs_read_data data)		static int nfs3_read_done(struct rpc_task task, struct nfs_pgio_data data)
	{		{
	struct inode *inode = data->header->inode;		struct inode *inode = data->header->inode;

	@@ -807,18 +807,18 @@ static int nfs3_read_done(struct rpc_task task, struct nfs_read_data data)
	return 0;		return 0;
	}		}

	static void nfs3_proc_read_setup(struct nfs_read_data data, struct rpc_message msg)		static void nfs3_proc_read_setup(struct nfs_pgio_data data, struct rpc_message msg)
	{		{
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ];		msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ];
	}		}

	static int nfs3_proc_read_rpc_prepare(struct rpc_task task, struct nfs_read_data data)		static int nfs3_proc_read_rpc_prepare(struct rpc_task task, struct nfs_pgio_data data)
	{		{
	rpc_call_start(task);		rpc_call_start(task);
	return 0;		return 0;
	}		}

	static int nfs3_write_done(struct rpc_task task, struct nfs_write_data data)		static int nfs3_write_done(struct rpc_task task, struct nfs_pgio_data data)
	{		{
	struct inode *inode = data->header->inode;		struct inode *inode = data->header->inode;

	@@ -829,12 +829,12 @@ static int nfs3_write_done(struct rpc_task task, struct nfs_write_data data)
	return 0;		return 0;
	}		}

	static void nfs3_proc_write_setup(struct nfs_write_data data, struct rpc_message msg)		static void nfs3_proc_write_setup(struct nfs_pgio_data data, struct rpc_message msg)
	{		{
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE];		msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE];
	}		}

	static int nfs3_proc_write_rpc_prepare(struct rpc_task task, struct nfs_write_data data)		static int nfs3_proc_write_rpc_prepare(struct rpc_task task, struct nfs_pgio_data data)
	{		{
	rpc_call_start(task);		rpc_call_start(task);
	return 0;		return 0;

fs/nfs/nfs4_fs.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -337,7 +337,7 @@ nfs4_state_protect(struct nfs_client *clp, unsigned long sp4_mode,
	*/		*/
	static inline void		static inline void
	nfs4_state_protect_write(struct nfs_client clp, struct rpc_clnt *clntp,		nfs4_state_protect_write(struct nfs_client clp, struct rpc_clnt *clntp,
	struct rpc_message msg, struct nfs_write_data wdata)		struct rpc_message msg, struct nfs_pgio_data wdata)
	{		{
	if (_nfs4_state_protect(clp, NFS_SP4_MACH_CRED_WRITE, clntp, msg) &&		if (_nfs4_state_protect(clp, NFS_SP4_MACH_CRED_WRITE, clntp, msg) &&
	!test_bit(NFS_SP4_MACH_CRED_COMMIT, &clp->cl_sp4_flags))		!test_bit(NFS_SP4_MACH_CRED_COMMIT, &clp->cl_sp4_flags))
	@@ -369,7 +369,7 @@ nfs4_state_protect(struct nfs_client *clp, unsigned long sp4_flags,

	static inline void		static inline void
	nfs4_state_protect_write(struct nfs_client clp, struct rpc_clnt *clntp,		nfs4_state_protect_write(struct nfs_client clp, struct rpc_clnt *clntp,
	struct rpc_message msg, struct nfs_write_data wdata)		struct rpc_message msg, struct nfs_pgio_data wdata)
	{		{
	}		}
	#endif /* CONFIG_NFS_V4_1 */		#endif /* CONFIG_NFS_V4_1 */

fs/nfs/nfs4filelayout.c

+17 −17

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,7 @@ filelayout_get_dserver_offset(struct pnfs_layout_segment *lseg, loff_t offset)
	BUG();		BUG();
	}		}

	static void filelayout_reset_write(struct nfs_write_data *data)		static void filelayout_reset_write(struct nfs_pgio_data *data)
	{		{
	struct nfs_pgio_header *hdr = data->header;		struct nfs_pgio_header *hdr = data->header;
	struct rpc_task *task = &data->task;		struct rpc_task *task = &data->task;
	@@ -105,7 +105,7 @@ static void filelayout_reset_write(struct nfs_write_data *data)
	}		}
	}		}

	static void filelayout_reset_read(struct nfs_read_data *data)		static void filelayout_reset_read(struct nfs_pgio_data *data)
	{		{
	struct nfs_pgio_header *hdr = data->header;		struct nfs_pgio_header *hdr = data->header;
	struct rpc_task *task = &data->task;		struct rpc_task *task = &data->task;
	@@ -243,7 +243,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,
	/* NFS_PROTO call done callback routines */		/* NFS_PROTO call done callback routines */

	static int filelayout_read_done_cb(struct rpc_task *task,		static int filelayout_read_done_cb(struct rpc_task *task,
	struct nfs_read_data *data)		struct nfs_pgio_data *data)
	{		{
	struct nfs_pgio_header *hdr = data->header;		struct nfs_pgio_header *hdr = data->header;
	int err;		int err;
	@@ -270,7 +270,7 @@ static int filelayout_read_done_cb(struct rpc_task *task,
	* rfc5661 is not clear about which credential should be used.		* rfc5661 is not clear about which credential should be used.
	*/		*/
	static void		static void
	filelayout_set_layoutcommit(struct nfs_write_data *wdata)		filelayout_set_layoutcommit(struct nfs_pgio_data *wdata)
	{		{
	struct nfs_pgio_header *hdr = wdata->header;		struct nfs_pgio_header *hdr = wdata->header;

	@@ -305,7 +305,7 @@ filelayout_reset_to_mds(struct pnfs_layout_segment *lseg)
	*/		*/
	static void filelayout_read_prepare(struct rpc_task task, void data)		static void filelayout_read_prepare(struct rpc_task task, void data)
	{		{
	struct nfs_read_data *rdata = data;		struct nfs_pgio_data *rdata = data;

	if (unlikely(test_bit(NFS_CONTEXT_BAD, &rdata->args.context->flags))) {		if (unlikely(test_bit(NFS_CONTEXT_BAD, &rdata->args.context->flags))) {
	rpc_exit(task, -EIO);		rpc_exit(task, -EIO);
	@@ -317,7 +317,7 @@ static void filelayout_read_prepare(struct rpc_task task, void data)
	rpc_exit(task, 0);		rpc_exit(task, 0);
	return;		return;
	}		}
	rdata->read_done_cb = filelayout_read_done_cb;		rdata->pgio_done_cb = filelayout_read_done_cb;

	if (nfs41_setup_sequence(rdata->ds_clp->cl_session,		if (nfs41_setup_sequence(rdata->ds_clp->cl_session,
	&rdata->args.seq_args,		&rdata->args.seq_args,
	@@ -331,7 +331,7 @@ static void filelayout_read_prepare(struct rpc_task task, void data)

	static void filelayout_read_call_done(struct rpc_task task, void data)		static void filelayout_read_call_done(struct rpc_task task, void data)
	{		{
	struct nfs_read_data *rdata = data;		struct nfs_pgio_data *rdata = data;

	dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);		dprintk("--> %s task->tk_status %d\n", __func__, task->tk_status);

	@@ -347,14 +347,14 @@ static void filelayout_read_call_done(struct rpc_task task, void data)

	static void filelayout_read_count_stats(struct rpc_task task, void data)		static void filelayout_read_count_stats(struct rpc_task task, void data)
	{		{
	struct nfs_read_data *rdata = data;		struct nfs_pgio_data *rdata = data;

	rpc_count_iostats(task, NFS_SERVER(rdata->header->inode)->client->cl_metrics);		rpc_count_iostats(task, NFS_SERVER(rdata->header->inode)->client->cl_metrics);
	}		}

	static void filelayout_read_release(void *data)		static void filelayout_read_release(void *data)
	{		{
	struct nfs_read_data *rdata = data;		struct nfs_pgio_data *rdata = data;
	struct pnfs_layout_hdr *lo = rdata->header->lseg->pls_layout;		struct pnfs_layout_hdr *lo = rdata->header->lseg->pls_layout;

	filelayout_fenceme(lo->plh_inode, lo);		filelayout_fenceme(lo->plh_inode, lo);
	@@ -363,7 +363,7 @@ static void filelayout_read_release(void *data)
	}		}

	static int filelayout_write_done_cb(struct rpc_task *task,		static int filelayout_write_done_cb(struct rpc_task *task,
	struct nfs_write_data *data)		struct nfs_pgio_data *data)
	{		{
	struct nfs_pgio_header *hdr = data->header;		struct nfs_pgio_header *hdr = data->header;
	int err;		int err;
	@@ -419,7 +419,7 @@ static int filelayout_commit_done_cb(struct rpc_task *task,

	static void filelayout_write_prepare(struct rpc_task task, void data)		static void filelayout_write_prepare(struct rpc_task task, void data)
	{		{
	struct nfs_write_data *wdata = data;		struct nfs_pgio_data *wdata = data;

	if (unlikely(test_bit(NFS_CONTEXT_BAD, &wdata->args.context->flags))) {		if (unlikely(test_bit(NFS_CONTEXT_BAD, &wdata->args.context->flags))) {
	rpc_exit(task, -EIO);		rpc_exit(task, -EIO);
	@@ -443,7 +443,7 @@ static void filelayout_write_prepare(struct rpc_task task, void data)

	static void filelayout_write_call_done(struct rpc_task task, void data)		static void filelayout_write_call_done(struct rpc_task task, void data)
	{		{
	struct nfs_write_data *wdata = data;		struct nfs_pgio_data *wdata = data;

	if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&		if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
	task->tk_status == 0) {		task->tk_status == 0) {
	@@ -457,14 +457,14 @@ static void filelayout_write_call_done(struct rpc_task task, void data)

	static void filelayout_write_count_stats(struct rpc_task task, void data)		static void filelayout_write_count_stats(struct rpc_task task, void data)
	{		{
	struct nfs_write_data *wdata = data;		struct nfs_pgio_data *wdata = data;

	rpc_count_iostats(task, NFS_SERVER(wdata->header->inode)->client->cl_metrics);		rpc_count_iostats(task, NFS_SERVER(wdata->header->inode)->client->cl_metrics);
	}		}

	static void filelayout_write_release(void *data)		static void filelayout_write_release(void *data)
	{		{
	struct nfs_write_data *wdata = data;		struct nfs_pgio_data *wdata = data;
	struct pnfs_layout_hdr *lo = wdata->header->lseg->pls_layout;		struct pnfs_layout_hdr *lo = wdata->header->lseg->pls_layout;

	filelayout_fenceme(lo->plh_inode, lo);		filelayout_fenceme(lo->plh_inode, lo);
	@@ -529,7 +529,7 @@ static const struct rpc_call_ops filelayout_commit_call_ops = {
	};		};

	static enum pnfs_try_status		static enum pnfs_try_status
	filelayout_read_pagelist(struct nfs_read_data *data)		filelayout_read_pagelist(struct nfs_pgio_data *data)
	{		{
	struct nfs_pgio_header *hdr = data->header;		struct nfs_pgio_header *hdr = data->header;
	struct pnfs_layout_segment *lseg = hdr->lseg;		struct pnfs_layout_segment *lseg = hdr->lseg;
	@@ -575,7 +575,7 @@ filelayout_read_pagelist(struct nfs_read_data *data)

	/* Perform async writes. */		/* Perform async writes. */
	static enum pnfs_try_status		static enum pnfs_try_status
	filelayout_write_pagelist(struct nfs_write_data *data, int sync)		filelayout_write_pagelist(struct nfs_pgio_data *data, int sync)
	{		{
	struct nfs_pgio_header *hdr = data->header;		struct nfs_pgio_header *hdr = data->header;
	struct pnfs_layout_segment *lseg = hdr->lseg;		struct pnfs_layout_segment *lseg = hdr->lseg;
	@@ -600,7 +600,7 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)
	__func__, hdr->inode->i_ino, sync, (size_t) data->args.count,		__func__, hdr->inode->i_ino, sync, (size_t) data->args.count,
	offset, ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count));		offset, ds->ds_remotestr, atomic_read(&ds->ds_clp->cl_count));

	data->write_done_cb = filelayout_write_done_cb;		data->pgio_done_cb = filelayout_write_done_cb;
	atomic_inc(&ds->ds_clp->cl_count);		atomic_inc(&ds->ds_clp->cl_count);
	data->ds_clp = ds->ds_clp;		data->ds_clp = ds->ds_clp;
	fh = nfs4_fl_select_ds_fh(lseg, j);		fh = nfs4_fl_select_ds_fh(lseg, j);

Original line number	Original line	Diff line number	Diff line
	@@ -401,13 +401,13 @@ extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,
	struct inode *inode, bool force_mds,		struct inode *inode, bool force_mds,
	const struct nfs_pgio_completion_ops *compl_ops);		const struct nfs_pgio_completion_ops *compl_ops);
	extern int nfs_initiate_read(struct rpc_clnt *clnt,		extern int nfs_initiate_read(struct rpc_clnt *clnt,
	struct nfs_read_data *data,		struct nfs_pgio_data *data,
	const struct rpc_call_ops *call_ops, int flags);		const struct rpc_call_ops *call_ops, int flags);
	extern void nfs_read_prepare(struct rpc_task task, void calldata);		extern void nfs_read_prepare(struct rpc_task task, void calldata);
	extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,		extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,
	struct nfs_pgio_header *hdr);		struct nfs_pgio_header *hdr);
	extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);		extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);
	extern void nfs_readdata_release(struct nfs_read_data *rdata);		extern void nfs_readdata_release(struct nfs_pgio_data *rdata);

	/* super.c */		/* super.c */
	void nfs_clone_super(struct super_block , struct nfs_mount_info );		void nfs_clone_super(struct super_block , struct nfs_mount_info );
	@@ -429,10 +429,10 @@ extern void nfs_writehdr_free(struct nfs_pgio_header *hdr);
	extern int nfs_generic_flush(struct nfs_pageio_descriptor *desc,		extern int nfs_generic_flush(struct nfs_pageio_descriptor *desc,
	struct nfs_pgio_header *hdr);		struct nfs_pgio_header *hdr);
	extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio);		extern void nfs_pageio_reset_write_mds(struct nfs_pageio_descriptor *pgio);
	extern void nfs_writedata_release(struct nfs_write_data *wdata);		extern void nfs_writedata_release(struct nfs_pgio_data *wdata);
	extern void nfs_commit_free(struct nfs_commit_data *p);		extern void nfs_commit_free(struct nfs_commit_data *p);
	extern int nfs_initiate_write(struct rpc_clnt *clnt,		extern int nfs_initiate_write(struct rpc_clnt *clnt,
	struct nfs_write_data *data,		struct nfs_pgio_data *data,
	const struct rpc_call_ops *call_ops,		const struct rpc_call_ops *call_ops,
	int how, int flags);		int how, int flags);
	extern void nfs_write_prepare(struct rpc_task task, void calldata);		extern void nfs_write_prepare(struct rpc_task task, void calldata);
	@@ -492,7 +492,7 @@ static inline void nfs_inode_dio_wait(struct inode *inode)
	extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq);		extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq);

	/* nfs4proc.c */		/* nfs4proc.c */
	extern void __nfs4_read_done_cb(struct nfs_read_data *);		extern void __nfs4_read_done_cb(struct nfs_pgio_data *);
	extern struct nfs_client nfs4_init_client(struct nfs_client clp,		extern struct nfs_client nfs4_init_client(struct nfs_client clp,
	const struct rpc_timeout *timeparms,		const struct rpc_timeout *timeparms,
	const char *ip_addr);		const char *ip_addr);