aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2013-11-14 17:32:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 19:32:21 -0500
commit16735d022f72b20ddbb2274b8e109f69575e9b2b (patch)
treef567c7dfff06ae18899feab7cd8a79a7a0f7be40 /fs
parentc32f74ab2872994bc8336ed367313da3139350ca (diff)
tree-wide: use reinit_completion instead of INIT_COMPLETION
Use this new function to make code more comprehensible, since we are reinitialzing the completion, not initializing. [akpm@linux-foundation.org: linux-next resyncs] Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13) Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/crypto.c2
-rw-r--r--fs/nfs/nfs4state.c2
-rw-r--r--fs/ocfs2/dlmglue.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 000eae2782b6..2f6735dbf1a9 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -392,7 +392,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
392 392
393 wait_for_completion(&ecr->completion); 393 wait_for_completion(&ecr->completion);
394 rc = ecr->rc; 394 rc = ecr->rc;
395 INIT_COMPLETION(ecr->completion); 395 reinit_completion(&ecr->completion);
396 } 396 }
397out: 397out:
398 ablkcipher_request_free(req); 398 ablkcipher_request_free(req);
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index c8e729deb4f7..74a7e12e10df 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -244,7 +244,7 @@ static int nfs4_drain_slot_tbl(struct nfs4_slot_table *tbl)
244 set_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state); 244 set_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state);
245 spin_lock(&tbl->slot_tbl_lock); 245 spin_lock(&tbl->slot_tbl_lock);
246 if (tbl->highest_used_slotid != NFS4_NO_SLOT) { 246 if (tbl->highest_used_slotid != NFS4_NO_SLOT) {
247 INIT_COMPLETION(tbl->complete); 247 reinit_completion(&tbl->complete);
248 spin_unlock(&tbl->slot_tbl_lock); 248 spin_unlock(&tbl->slot_tbl_lock);
249 return wait_for_completion_interruptible(&tbl->complete); 249 return wait_for_completion_interruptible(&tbl->complete);
250 } 250 }
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 3a44a648dae7..3407b2c62b21 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -1304,7 +1304,7 @@ static int ocfs2_wait_for_mask(struct ocfs2_mask_waiter *mw)
1304{ 1304{
1305 wait_for_completion(&mw->mw_complete); 1305 wait_for_completion(&mw->mw_complete);
1306 /* Re-arm the completion in case we want to wait on it again */ 1306 /* Re-arm the completion in case we want to wait on it again */
1307 INIT_COMPLETION(mw->mw_complete); 1307 reinit_completion(&mw->mw_complete);
1308 return mw->mw_status; 1308 return mw->mw_status;
1309} 1309}
1310 1310
@@ -1355,7 +1355,7 @@ static int ocfs2_wait_for_mask_interruptible(struct ocfs2_mask_waiter *mw,
1355 else 1355 else
1356 ret = mw->mw_status; 1356 ret = mw->mw_status;
1357 /* Re-arm the completion in case we want to wait on it again */ 1357 /* Re-arm the completion in case we want to wait on it again */
1358 INIT_COMPLETION(mw->mw_complete); 1358 reinit_completion(&mw->mw_complete);
1359 return ret; 1359 return ret;
1360} 1360}
1361 1361