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

Commit 48d635f1 authored by Peng Tao's avatar Peng Tao Committed by Tom Haynes
Browse files

nfs: add nfs_pgio_current_mirror helper 



Let it return current nfs_pgio_mirror in use depending on pg_mirror_count.
For read, we always use pg_mirrors[0], so this effectively gives us freedom
to use pg_mirror_idx to track the actual mirror to read from through out the
IO stack.

Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTom Haynes <loghyr@primarydata.com>
parent 47af81f2

fs/nfs/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, 
		      struct rpc_cred *cred, const struct nfs_rpc_ops *rpc_ops,

		      const struct rpc_call_ops *call_ops, int how, int flags);

void nfs_free_request(struct nfs_page *req);

struct nfs_pgio_mirror *

nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc);



static inline void nfs_iocounter_init(struct nfs_io_counter *c)

{

fs/nfs/objlayout/objio_osd.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ int objio_write_pagelist(struct nfs_pgio_header *hdr, int how) 
static size_t objio_pg_test(struct nfs_pageio_descriptor *pgio,

			  struct nfs_page *prev, struct nfs_page *req)

{

	struct nfs_pgio_mirror *mirror = &pgio->pg_mirrors[pgio->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(pgio);

	unsigned int size;



	size = pnfs_generic_pg_test(pgio, prev, req);

fs/nfs/pagelist.c

+17 −8
Original line number Diff line number Diff line
@@ -42,11 +42,20 @@ static bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount) 
	return p->pagevec != NULL;

}



struct nfs_pgio_mirror *

nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc)

{

	return nfs_pgio_has_mirroring(desc) ?

		&desc->pg_mirrors[desc->pg_mirror_idx] :

		&desc->pg_mirrors[0];

}

EXPORT_SYMBOL_GPL(nfs_pgio_current_mirror);



void nfs_pgheader_init(struct nfs_pageio_descriptor *desc,

		       struct nfs_pgio_header *hdr,

		       void (*release)(struct nfs_pgio_header *hdr))

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);





	hdr->req = nfs_list_entry(mirror->pg_list.next);
@@ -485,7 +494,7 @@ nfs_wait_on_request(struct nfs_page *req) 
size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,

			   struct nfs_page *prev, struct nfs_page *req)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);





	if (mirror->pg_count > mirror->pg_bsize) {
@@ -782,7 +791,7 @@ static void nfs_pgio_result(struct rpc_task *task, void *calldata) 
int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,

		     struct nfs_pgio_header *hdr)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	struct nfs_page		*req;

	struct page		**pages,
@@ -831,7 +840,7 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc) 
	struct nfs_pgio_header *hdr;

	int ret;



	mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	mirror = nfs_pgio_current_mirror(desc);



	hdr = nfs_pgio_header_alloc(desc->pg_rw_ops);

	if (!hdr) {
@@ -961,7 +970,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, 
static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,

				     struct nfs_page *req)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	struct nfs_page *prev = NULL;
@@ -985,7 +994,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc, 
 */

static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);





	if (!list_empty(&mirror->pg_list)) {
@@ -1015,7 +1024,7 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc) 
static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,

			   struct nfs_page *req)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	struct nfs_page *subreq;

	unsigned int bytes_left = 0;
@@ -1078,7 +1087,7 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, 


static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);

	LIST_HEAD(head);



	do {

fs/nfs/pnfs.c

+4 −5
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ static void 
pnfs_write_through_mds(struct nfs_pageio_descriptor *desc,

		struct nfs_pgio_header *hdr)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {

		list_splice_tail_init(&hdr->pages, &mirror->pg_list);
@@ -1785,7 +1785,7 @@ EXPORT_SYMBOL_GPL(pnfs_writehdr_free); 
int

pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	struct nfs_pgio_header *hdr;

	int ret;
@@ -1846,8 +1846,7 @@ static void 
pnfs_read_through_mds(struct nfs_pageio_descriptor *desc,

		struct nfs_pgio_header *hdr)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];



	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {

		list_splice_tail_init(&hdr->pages, &mirror->pg_list);
@@ -1903,7 +1902,7 @@ EXPORT_SYMBOL_GPL(pnfs_readhdr_free); 
int

pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc)

{

	struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];

	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);



	struct nfs_pgio_header *hdr;

	int ret;