On May 2, 2014, at 12:22 PM, Weston Andros Adamson <dros@xxxxxxxxxxxxxxx> wrote: > On May 1, 2014, at 4:56 PM, Weston Andros Adamson <dros@xxxxxxxxxxxxxxx> wrote: > >> >> >> On May 1, 2014, at 4:19 PM, Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> wrote: >> >>> >>> On May 1, 2014, at 15:14, Weston Andros Adamson <dros@xxxxxxxxxxxxxxx> wrote: >>> >>>> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h >>>> index a7ccc8c..8564539 100644 >>>> --- a/include/linux/nfs_xdr.h >>>> +++ b/include/linux/nfs_xdr.h >>>> @@ -1261,13 +1261,13 @@ struct nfs_pgio_data { >>>> struct list_head list; >>>> struct rpc_task task; >>>> struct nfs_fattr fattr; >>>> - struct nfs_writeverf verf; /* Used for writes */ >>>> + struct nfs_writeverf rpc_verf; /* Used for writes */ >>> >>> Can we just make this “writeverf"? It isn’t really an rpc object, so the ‘rpc_’ prefix seems a little misleading. >> >> yes, good point. >> >> -dros >> > > Actually, having a verf in the header and in pgio_data is redundant now that there is only one pgio_data (the > header verf was used to make sure that all pgio_data verfs matched). > > I’ll remove rpc_verf. I should point out that the header verf is also used to compare the WRITE verf(s) with the COMMIT verf (from nfs_commit_data), but this will stay the same. -dros >>> >>>> struct nfs_pgio_args args; /* argument struct */ >>>> struct nfs_pgio_res res; /* result struct */ >>>> unsigned long timestamp; /* For lease renewal */ >>>> int (*pgio_done_cb)(struct rpc_task *task, struct nfs_pgio_data *data); >>>> __u64 mds_offset; /* Filelayout dense stripe */ >>>> - struct nfs_page_array pages; >>>> + struct nfs_page_array page_array; >>>> struct nfs_client *ds_clp; /* pNFS data server */ >>>> int ds_idx; /* ds index if ds_clp is set */ >>>> }; >>>> -- >>>> 1.8.5.2 (Apple Git-48) >>>> >>> >>> _________________________________ >>> Trond Myklebust >>> Linux NFS client maintainer, PrimaryData >>> trond.myklebust@xxxxxxxxxxxxxxx >>> >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html