From: Andy Adamson <andros@xxxxxxxxxx>
Not used by the file layout driver
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/nfs4proc.c | 4 ++--
fs/nfs/pnfs.c | 24 ------------------------
fs/nfs/pnfs.h | 1 -
include/linux/nfs4_pnfs.h | 3 ---
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 8b375a7..2826ada 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5600,7 +5600,7 @@ static int pnfs4_sync_layoutcommit(struct pnfs_layoutcommit_data *data)
} while (exception.retry);
data->status = err;
- pnfs_layoutcommit_done(data);
+ put_rpccred(data->cred);
pnfs_layoutcommit_free(data);
return err;
}
@@ -5625,7 +5625,7 @@ pnfs_layoutcommit_rpc_done(struct rpc_task *task, void *calldata)
struct nfs_server *server = NFS_SERVER(data->args.inode);
data->status = task->tk_status;
- pnfs_layoutcommit_done(data);
+ put_rpccred(data->cred);
nfs4_sequence_done(server, &data->res.seq_res, task->tk_status);
}
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 23787ff..def27f8 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1912,30 +1912,6 @@ out:
return trypnfs;
}
-/* Called on completion of layoutcommit */
-void
-pnfs_layoutcommit_done(struct pnfs_layoutcommit_data *data)
-{
- struct nfs_server *nfss = NFS_SERVER(data->args.inode);
- struct nfs_inode *nfsi = NFS_I(data->args.inode);
-
- dprintk("%s: (status %d)\n", __func__, data->status);
-
- if (data->status < 0)
- printk(KERN_ERR "%s, Layoutcommit Failed! = %d\n",
- __func__, data->status);
-
- /* TODO: Maybe we should avoid this by allowing the layout driver
- * to directly xdr its layout on the wire.
- */
- if (nfss->pnfs_curr_ld->ld_io_ops->cleanup_layoutcommit)
- nfss->pnfs_curr_ld->ld_io_ops->cleanup_layoutcommit(
- &nfsi->layout,
- &data->args,
- data->status);
- put_rpccred(data->cred);
-}
-
/*
* Set up the argument/result storage required for the RPC call.
*/
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index c89be78..43e02f8 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -46,7 +46,6 @@ enum pnfs_try_status _pnfs_try_to_read_data(struct nfs_read_data *,
const struct rpc_call_ops *);
int pnfs_initialize(void);
void pnfs_uninitialize(void);
-void pnfs_layoutcommit_done(struct pnfs_layoutcommit_data *data);
void pnfs_layoutcommit_free(struct pnfs_layoutcommit_data *data);
int pnfs_layoutcommit_inode(struct inode *inode, int sync);
void pnfs_update_last_write(struct nfs_inode *nfsi, loff_t offset, size_t extent);
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index cab9137..1b017fe 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -149,9 +149,6 @@ struct layoutdriver_io_operations {
void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
struct xdr_stream *xdr,
const struct pnfs_layoutcommit_arg *args);
- void (*cleanup_layoutcommit) (struct pnfs_layout_type *layoutid,
- struct pnfs_layoutcommit_arg *args,
- int status);
void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid,
struct xdr_stream *xdr,
const struct nfs4_pnfs_layoutreturn_arg *args);
--
1.6.6
--
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
