The following commit has been merged in the linux branch: commit a8b40bc7e635831b61c43acc71a86d3a68b2dff0 Author: Terry Loftin terry.loftin@hp.com Date: Thu Oct 22 21:36:01 2009 -0400
nfs: Panic when commit fails
Actually pass the NFS_FILE_SYNC option to the server to avoid a Panic in nfs_direct_write_complete() when a commit fails.
At the end of an nfs write, if the nfs commit fails, all the writes will be rescheduled. They are supposed to be rescheduled as NFS_FILE_SYNC writes, but the rpc_task structure is not completely intialized and so the option is not passed. When the rescheduled writes complete, the return indicates that they are NFS_UNSTABLE and we try to do another commit. This leads to a Panic because the commit data structure pointer was set to null in the initial (failed) commit attempt.
Signed-off-by: Terry Loftin terry.loftin@hp.com Signed-off-by: Trond Myklebust Trond.Myklebust@netapp.com
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 6c32100..e1d415e 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -457,6 +457,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) }; struct rpc_task_setup task_setup_data = { .rpc_client = NFS_CLIENT(inode), + .rpc_message = &msg, .callback_ops = &nfs_write_direct_ops, .workqueue = nfsiod_workqueue, .flags = RPC_TASK_ASYNC,