UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfs: rename pgio header ds_idx to ds_commit_idx 

'ds_commit_idx' is a better name - it is used to select the right
commit bucket for pnfs.

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
This commit is contained in:
Weston Andros Adamson 2014-09-16 17:35:51 -04:00 committed by Tom Haynes
parent 309a1d65b1
commit 6cccbb6f52
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/direct.c
View File

@ -112,22 +112,22 @@ static inline int put_dreq(struct nfs_direct_req *dreq)
* nfs_direct_select_verf - select the right verifier * nfs_direct_select_verf - select the right verifier
* @dreq - direct request possibly spanning multiple servers * @dreq - direct request possibly spanning multiple servers
* @ds_clp - nfs_client of data server or NULL if MDS / non-pnfs * @ds_clp - nfs_client of data server or NULL if MDS / non-pnfs
* @ds_idx - index of data server in data server list, only valid if ds_clp set * @commit_idx - commit bucket index for the DS
* *
* returns the correct verifier to use given the role of the server * returns the correct verifier to use given the role of the server
*/ */
static struct nfs_writeverf * static struct nfs_writeverf *
nfs_direct_select_verf(struct nfs_direct_req *dreq, nfs_direct_select_verf(struct nfs_direct_req *dreq,
struct nfs_client *ds_clp, struct nfs_client *ds_clp,
int ds_idx) int commit_idx)
{ {
struct nfs_writeverf *verfp = &dreq->verf; struct nfs_writeverf *verfp = &dreq->verf;
#ifdef CONFIG_NFS_V4_1 #ifdef CONFIG_NFS_V4_1
if (ds_clp) { if (ds_clp) {
/* pNFS is in use, use the DS verf */ /* pNFS is in use, use the DS verf */
if (ds_idx >= 0 && ds_idx < dreq->ds_cinfo.nbuckets) if (commit_idx >= 0 && commit_idx < dreq->ds_cinfo.nbuckets)
verfp = &dreq->ds_cinfo.buckets[ds_idx].direct_verf; verfp = &dreq->ds_cinfo.buckets[commit_idx].direct_verf;
else else
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
} }
@ -148,8 +148,7 @@ static void nfs_direct_set_hdr_verf(struct nfs_direct_req *dreq,
{ {
struct nfs_writeverf *verfp; struct nfs_writeverf *verfp;
verfp = nfs_direct_select_verf(dreq, hdr->ds_clp, verfp = nfs_direct_select_verf(dreq, hdr->ds_clp, hdr->ds_commit_idx);
hdr->ds_idx);
WARN_ON_ONCE(verfp->committed >= 0); WARN_ON_ONCE(verfp->committed >= 0);
memcpy(verfp, &hdr->verf, sizeof(struct nfs_writeverf)); memcpy(verfp, &hdr->verf, sizeof(struct nfs_writeverf));
WARN_ON_ONCE(verfp->committed < 0); WARN_ON_ONCE(verfp->committed < 0);
@ -169,8 +168,7 @@ static int nfs_direct_set_or_cmp_hdr_verf(struct nfs_direct_req *dreq,
{ {
struct nfs_writeverf *verfp; struct nfs_writeverf *verfp;
verfp = nfs_direct_select_verf(dreq, hdr->ds_clp, verfp = nfs_direct_select_verf(dreq, hdr->ds_clp, hdr->ds_commit_idx);
hdr->ds_idx);
if (verfp->committed < 0) { if (verfp->committed < 0) {
nfs_direct_set_hdr_verf(dreq, hdr); nfs_direct_set_hdr_verf(dreq, hdr);
return 0; return 0;

4
fs/nfs/filelayout/filelayout.c
View File

@ -492,7 +492,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr)
/* No multipath support. Use first DS */ /* No multipath support. Use first DS */
atomic_inc(&ds->ds_clp->cl_count); atomic_inc(&ds->ds_clp->cl_count);
hdr->ds_clp = ds->ds_clp; hdr->ds_clp = ds->ds_clp;
hdr->ds_idx = idx; hdr->ds_commit_idx = idx;
fh = nfs4_fl_select_ds_fh(lseg, j); fh = nfs4_fl_select_ds_fh(lseg, j);
if (fh) if (fh)
hdr->args.fh = fh; hdr->args.fh = fh;
@ -536,7 +536,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync)
hdr->pgio_done_cb = filelayout_write_done_cb; hdr->pgio_done_cb = filelayout_write_done_cb;
atomic_inc(&ds->ds_clp->cl_count); atomic_inc(&ds->ds_clp->cl_count);
hdr->ds_clp = ds->ds_clp; hdr->ds_clp = ds->ds_clp;
hdr->ds_idx = idx; hdr->ds_commit_idx = idx;
fh = nfs4_fl_select_ds_fh(lseg, j); fh = nfs4_fl_select_ds_fh(lseg, j);
if (fh) if (fh)
hdr->args.fh = fh; hdr->args.fh = fh;

2
include/linux/nfs_xdr.h
View File

@ -1328,7 +1328,7 @@ struct nfs_pgio_header {
__u64 mds_offset; /* Filelayout dense stripe */ __u64 mds_offset; /* Filelayout dense stripe */
struct nfs_page_array page_array; struct nfs_page_array page_array;
struct nfs_client *ds_clp; /* pNFS data server */ struct nfs_client *ds_clp; /* pNFS data server */
int ds_idx; /* ds index if ds_clp is set */ int ds_commit_idx; /* ds index if ds_clp is set */
}; };
struct nfs_mds_commit_info { struct nfs_mds_commit_info {