diff options
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ad2bfa68d534..116cab970e0f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -2262,7 +2262,7 @@ nfs4_file_downgrade(struct nfs4_file *fp, unsigned int share_access) | |||
| 2262 | * Spawn a thread to perform a recall on the delegation represented | 2262 | * Spawn a thread to perform a recall on the delegation represented |
| 2263 | * by the lease (file_lock) | 2263 | * by the lease (file_lock) |
| 2264 | * | 2264 | * |
| 2265 | * Called from break_lease() with lock_kernel() held. | 2265 | * Called from break_lease() with lock_flocks() held. |
| 2266 | * Note: we assume break_lease will only call this *once* for any given | 2266 | * Note: we assume break_lease will only call this *once* for any given |
| 2267 | * lease. | 2267 | * lease. |
| 2268 | */ | 2268 | */ |
| @@ -2286,7 +2286,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl) | |||
| 2286 | list_add_tail(&dp->dl_recall_lru, &del_recall_lru); | 2286 | list_add_tail(&dp->dl_recall_lru, &del_recall_lru); |
| 2287 | spin_unlock(&recall_lock); | 2287 | spin_unlock(&recall_lock); |
| 2288 | 2288 | ||
| 2289 | /* only place dl_time is set. protected by lock_kernel*/ | 2289 | /* only place dl_time is set. protected by lock_flocks*/ |
| 2290 | dp->dl_time = get_seconds(); | 2290 | dp->dl_time = get_seconds(); |
| 2291 | 2291 | ||
| 2292 | /* | 2292 | /* |
| @@ -2303,7 +2303,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl) | |||
| 2303 | /* | 2303 | /* |
| 2304 | * The file_lock is being reapd. | 2304 | * The file_lock is being reapd. |
| 2305 | * | 2305 | * |
| 2306 | * Called by locks_free_lock() with lock_kernel() held. | 2306 | * Called by locks_free_lock() with lock_flocks() held. |
| 2307 | */ | 2307 | */ |
| 2308 | static | 2308 | static |
| 2309 | void nfsd_release_deleg_cb(struct file_lock *fl) | 2309 | void nfsd_release_deleg_cb(struct file_lock *fl) |
| @@ -2318,7 +2318,7 @@ void nfsd_release_deleg_cb(struct file_lock *fl) | |||
| 2318 | } | 2318 | } |
| 2319 | 2319 | ||
| 2320 | /* | 2320 | /* |
| 2321 | * Called from setlease() with lock_kernel() held | 2321 | * Called from setlease() with lock_flocks() held |
| 2322 | */ | 2322 | */ |
| 2323 | static | 2323 | static |
| 2324 | int nfsd_same_client_deleg_cb(struct file_lock *onlist, struct file_lock *try) | 2324 | int nfsd_same_client_deleg_cb(struct file_lock *onlist, struct file_lock *try) |
