[PATCH 23/24] pnfs_submit: remove unecessary pnfs_fl_call_data field commit_through_mds

Fred Isaman
2010-06-08T04:19:50Z

fs/nfs/nfs4proc.c | 8 ++++----
include/linux/nfs_xdr.h | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index aa4581a..ca17872 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3362,17 +3362,17 @@ static void nfs4_proc_commit_setup(struct nfs_write_data *data, struct rpc_messa

#if defined(CONFIG_NFS_V4_1)
/*
- * pNFS doew not send a getattr to Data Serfers on commit.
+ * pNFS doew not send a getattr to Data Servers on commit.
*/
static void
pnfs4_proc_commit_setup(struct nfs_write_data *data, struct rpc_message *msg)
{
struct nfs_server *server = NFS_SERVER(data->inode);

- dprintk("--> %s ds_nfs_client %p commit_through_mds %d\n", __func__,
- data->fldata.ds_nfs_client, data->fldata.commit_through_mds);
+ dprintk("--> %s ds_nfs_client %p\n", __func__,
+ data->fldata.ds_nfs_client);

- if (!data->fldata.ds_nfs_client || data->fldata.commit_through_mds)
+ if (!data->fldata.ds_nfs_client)
return nfs4_proc_commit_setup(data, msg);

data->args.bitmask = server->attr_bitmask;
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 183a9c3..2acdb8e 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -982,7 +982,6 @@ struct pnfs_call_data {
struct pnfs_fl_call_data {
struct nfs_client *ds_nfs_client;
__u64 orig_offset;
- int commit_through_mds;
};
#endif /* CONFIG_NFS_V4_1 */

--
1.6.6.1