commit 4011cd97886dd04b90fef8b671b9936cd39ab983
author Trond Myklebust <Trond.Myklebust@netapp.com> Tue Aug 07 15:33:01 2007 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> Tue Aug 07 16:13:01 2007 -0400
tree 8933e97a2215498fd096502005dbf763527ded2a
parent 3d39c691ff486142dd9aaeac12f553f4476b7a62

SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

net/sunrpc/rpc_pipe.c

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 650af06..669e12a 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -132,8 +132,7 @@
 		rpci->nwriters = 0;
 		if (ops->release_pipe)
 			ops->release_pipe(inode);
-		cancel_delayed_work(&rpci->queue_timeout);
-		flush_workqueue(rpciod_workqueue);
+		cancel_delayed_work_sync(&rpci->queue_timeout);
 	}
 	rpc_inode_setowner(inode, NULL);
 	mutex_unlock(&inode->i_mutex);