| From a8b40bc7e635831b61c43acc71a86d3a68b2dff0 Mon Sep 17 00:00:00 2001 |
| From: Terry Loftin <terry.loftin@hp.com> |
| Date: Thu, 22 Oct 2009 21:36:01 -0400 |
| Subject: nfs: Panic when commit fails |
| |
| From: Terry Loftin <terry.loftin@hp.com> |
| |
| commit a8b40bc7e635831b61c43acc71a86d3a68b2dff0 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| fs/nfs/direct.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/fs/nfs/direct.c |
| +++ b/fs/nfs/direct.c |
| @@ -454,6 +454,7 @@ static void nfs_direct_write_reschedule( |
| }; |
| 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, |
