diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /fs/dlm | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/member.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/member.c b/fs/dlm/member.c index 84f70bfb0baf..b12532e553f8 100644 --- a/fs/dlm/member.c +++ b/fs/dlm/member.c | |||
| @@ -312,7 +312,7 @@ int dlm_ls_stop(struct dlm_ls *ls) | |||
| 312 | /* | 312 | /* |
| 313 | * This in_recovery lock does two things: | 313 | * This in_recovery lock does two things: |
| 314 | * 1) Keeps this function from returning until all threads are out | 314 | * 1) Keeps this function from returning until all threads are out |
| 315 | * of locking routines and locking is truely stopped. | 315 | * of locking routines and locking is truly stopped. |
| 316 | * 2) Keeps any new requests from being processed until it's unlocked | 316 | * 2) Keeps any new requests from being processed until it's unlocked |
| 317 | * when recovery is complete. | 317 | * when recovery is complete. |
| 318 | */ | 318 | */ |