Skip to content

Commit

Permalink
nfs: add nfs_pgio_current_mirror helper
Browse files Browse the repository at this point in the history 
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: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
  • Loading branch information
Peng Tao authored and Tom Haynes committed Feb 3, 2015
1 parent 47af81f commit 48d635f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 14 deletions.
2 changes: 2 additions & 0 deletions fs/nfs/internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/objlayout/objio_osd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
25 changes: 17 additions & 8 deletions fs/nfs/pagelist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

Expand All @@ -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)) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions fs/nfs/pnfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 48d635f

Please sign in to comment.