diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-09 08:38:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-09 08:38:14 -0700 |
| commit | 8b80fc02b829a59602b0f53eb9393ffb2db2659d (patch) | |
| tree | 9cce02e07ed1b30d6f6bd236a2d6015e5681eeb9 /net/sunrpc/cache.c | |
| parent | 6a0ed91e361a93ee1efb4c20c4967024ed2a8dd7 (diff) | |
| parent | 4011cd97886dd04b90fef8b671b9936cd39ab983 (diff) | |
| download | kernel_samsung_aries-8b80fc02b829a59602b0f53eb9393ffb2db2659d.zip kernel_samsung_aries-8b80fc02b829a59602b0f53eb9393ffb2db2659d.tar.gz kernel_samsung_aries-8b80fc02b829a59602b0f53eb9393ffb2db2659d.tar.bz2 | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
SUNRPC: Replace flush_workqueue() with cancel_work_sync() and friends
NFS: Replace flush_scheduled_work with cancel_work_sync() and friends
SUNRPC: Don't call gss_delete_sec_context() from an rcu context
NFSv4: Don't call put_rpccred() from an rcu callback
NFS: Fix NFSv4 open stateid regressions
NFSv4: Fix a locking regression in nfs4_set_mode_locked()
NFS: Fix put_nfs_open_context
SUNRPC: Fix a race in rpciod_down()
Diffstat (limited to 'net/sunrpc/cache.c')
| -rw-r--r-- | net/sunrpc/cache.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 01c3c41..ebe344f 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; } |