diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /fs/afs | |
parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/afs')
-rw-r--r-- | fs/afs/kafsasyncd.c | 2 | ||||
-rw-r--r-- | fs/afs/kafstimod.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/kafsasyncd.c b/fs/afs/kafsasyncd.c index 6fc88ae8ad94..7ac07d0d47b9 100644 --- a/fs/afs/kafsasyncd.c +++ b/fs/afs/kafsasyncd.c | |||
@@ -116,7 +116,7 @@ static int kafsasyncd(void *arg) | |||
116 | remove_wait_queue(&kafsasyncd_sleepq, &myself); | 116 | remove_wait_queue(&kafsasyncd_sleepq, &myself); |
117 | set_current_state(TASK_RUNNING); | 117 | set_current_state(TASK_RUNNING); |
118 | 118 | ||
119 | try_to_freeze(PF_FREEZE); | 119 | try_to_freeze(); |
120 | 120 | ||
121 | /* discard pending signals */ | 121 | /* discard pending signals */ |
122 | afs_discard_my_signals(); | 122 | afs_discard_my_signals(); |
diff --git a/fs/afs/kafstimod.c b/fs/afs/kafstimod.c index 86e710dd057e..65bc05ab8182 100644 --- a/fs/afs/kafstimod.c +++ b/fs/afs/kafstimod.c | |||
@@ -91,7 +91,7 @@ static int kafstimod(void *arg) | |||
91 | complete_and_exit(&kafstimod_dead, 0); | 91 | complete_and_exit(&kafstimod_dead, 0); |
92 | } | 92 | } |
93 | 93 | ||
94 | try_to_freeze(PF_FREEZE); | 94 | try_to_freeze(); |
95 | 95 | ||
96 | /* discard pending signals */ | 96 | /* discard pending signals */ |
97 | afs_discard_my_signals(); | 97 | afs_discard_my_signals(); |