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

Commit 6296556f authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

NFS41: send real write size in layoutget 



For buffer write, block layout client scan inode mapping to find
next hole and use offset-to-hole as layoutget length. Object
layout client uses offset-to-isize as layoutget length.

For direct write, both block layout and object layout use dreq->bytes_left.

Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 35754bc0

fs/nfs/blocklayout/blocklayout.c

+35 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/bio.h>		/* struct bio */

#include <linux/buffer_head.h>	/* various write calls */

#include <linux/prefetch.h>

#include <linux/pagevec.h>



#include "../pnfs.h"

#include "../internal.h"
@@ -1204,14 +1205,45 @@ bl_pg_test_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, 
	return pnfs_generic_pg_test(pgio, prev, req);

}



/*

 * Return the number of contiguous bytes for a given inode

 * starting at page frame idx.

 */

static u64 pnfs_num_cont_bytes(struct inode *inode, pgoff_t idx)

{

	struct address_space *mapping = inode->i_mapping;

	pgoff_t end;



	/* Optimize common case that writes from 0 to end of file */

	end = DIV_ROUND_UP(i_size_read(inode), PAGE_CACHE_SIZE);

	if (end != NFS_I(inode)->npages) {

		rcu_read_lock();

		end = radix_tree_next_hole(&mapping->page_tree, idx + 1, ULONG_MAX);

		rcu_read_unlock();

	}



	if (!end)

		return i_size_read(inode) - (idx << PAGE_CACHE_SHIFT);

	else

		return (end - idx) << PAGE_CACHE_SHIFT;

}



static void

bl_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

{

	if (pgio->pg_dreq != NULL &&

	    !is_aligned_req(req, PAGE_CACHE_SIZE))

	    !is_aligned_req(req, PAGE_CACHE_SIZE)) {

		nfs_pageio_reset_write_mds(pgio);

	} else {

		u64 wb_size;

		if (pgio->pg_dreq == NULL)

			wb_size = pnfs_num_cont_bytes(pgio->pg_inode,

						      req->wb_index);

		else

		pnfs_generic_pg_init_write(pgio, req);

			wb_size = nfs_dreq_bytes_left(pgio->pg_dreq);



		pnfs_generic_pg_init_write(pgio, req, wb_size);

	}

}



static bool

fs/nfs/direct.c

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

#include <linux/slab.h>

#include <linux/task_io_accounting_ops.h>

#include <linux/module.h>



#include <linux/nfs_fs.h>

#include <linux/nfs_page.h>
@@ -191,6 +192,12 @@ static void nfs_direct_req_release(struct nfs_direct_req *dreq) 
	kref_put(&dreq->kref, nfs_direct_req_free);

}



ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq)

{

	return dreq->bytes_left;

}

EXPORT_SYMBOL_GPL(nfs_dreq_bytes_left);



/*

 * Collects and returns the final error value/byte-count.

 */

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ static inline void nfs_inode_dio_wait(struct inode *inode) 
{

	inode_dio_wait(inode);

}

extern ssize_t nfs_dreq_bytes_left(struct nfs_direct_req *dreq);



/* nfs4proc.c */

extern void __nfs4_read_done_cb(struct nfs_read_data *);

fs/nfs/objlayout/objio_osd.c

+8 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <scsi/osd_ore.h>



#include "objlayout.h"

#include "../internal.h"



#define NFSDBG_FACILITY         NFSDBG_PNFS_LD
@@ -606,8 +607,14 @@ static bool aligned_on_raid_stripe(u64 offset, struct ore_layout *layout, 
void objio_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

{

	unsigned long stripe_end = 0;

	u64 wb_size;



	pnfs_generic_pg_init_write(pgio, req);

	if (pgio->pg_dreq == NULL)

		wb_size = i_size_read(pgio->pg_inode) - req_offset(req);

	else

		wb_size = nfs_dreq_bytes_left(pgio->pg_dreq);



	pnfs_generic_pg_init_write(pgio, req, wb_size);

	if (unlikely(pgio->pg_lseg == NULL))

		return; /* Not pNFS */

fs/nfs/pnfs.c

+4 −2
Original line number Diff line number Diff line
@@ -1240,7 +1240,8 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r 
EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_read);



void

pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio,

			   struct nfs_page *req, u64 wb_size)

{

	BUG_ON(pgio->pg_lseg != NULL);
@@ -1248,10 +1249,11 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page * 
		nfs_pageio_reset_write_mds(pgio);

		return;

	}



	pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

					   req->wb_context,

					   req_offset(req),

					   req->wb_bytes,

					   wb_size,

					   IOMODE_RW,

					   GFP_NOFS);

	/* If no lseg, fall back to write through mds */