2 files changed, 2 insertions, 4 deletions

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 01c3c4105204..ebe344f34d1a 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -371,8 +371,7 @@ int cache_unregister(struct cache_detail *cd)
         }
         if (list_empty(&cache_list)) {
                 /* module must be being unloaded so its safe to kill the worker */
-                cancel_delayed_work(&cache_cleaner);
-                flush_scheduled_work();
+                cancel_delayed_work_sync(&cache_cleaner);
         }
         return 0;
 }
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 650af064ff8d..669e12a4ed18 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -132,8 +132,7 @@ rpc_close_pipes(struct inode *inode)
                 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);