Skip to contentSkip to conversation

staging : lustre : Remove braces from single-line body.

PATCH In review Tabrez khan 3 participants 3 messages Dec 16, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging : lustre : Remove braces from single-line body.

Remove unnecessary braces {} for single while statement. This warning is found using checkpatch.pl.

---
 drivers/staging/lustre/lustre/obdclass/cl_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/obdclass/cl_io.c +2 -2
index bc4b7b6..2daede8 100644
@@ -1371,9 +1371,9 @@ int cl_sync_io_wait(const struct lu_env *env, struct cl_sync_io *anchor,
 	LASSERT(atomic_read(&anchor->csi_sync_nr) == 0);
 
 	/* wait until cl_sync_io_note() has done wakeup */
-	while (unlikely(atomic_read(&anchor->csi_barrier) != 0)) {
+	while (unlikely(atomic_read(&anchor->csi_barrier) != 0))
 		cpu_relax();
-	}
+
 
 	return rc;
 }
Signature · 1 line
2.7.4
#1 lore raw
Quoted 1 line · Tabrez khan

Remove unnecessary braces {} for single while statement.

Your patch is fine Tabrez, but to the lustre folk:

drivers/staging/lustre/lustre/obdclass/cl_io.c

Quoted 1 line
drivers/staging/lustre/lustre/obdclass/cl_io.c +0 -0

[]

drivers/staging/lustre/lustre/obdclass/cl_io.c int cl_sync_io_wait(const struct lu_env *env, struct cl_sync_io *anchor,

Quoted 1 line
drivers/staging/lustre/lustre/obdclass/cl_io.c +0 -0
@@ -1371,9 +1371,9 @@ int cl_sync_io_wait(const struct lu_env *env, struct cl_sync_io *anchor,

LASSERT(atomic_read(&anchor->csi_sync_nr) == 0);

/* wait until cl_sync_io_note() has done wakeup */
- while (unlikely(atomic_read(&anchor->csi_barrier) != 0)) {
+ while (unlikely(atomic_read(&anchor->csi_barrier) != 0))
cpu_relax();
- }
+

What if the wakeup never occurs/succeeds?
Should there be a timeout?

#2 lore raw
Quoted 20 lines · Joe Perches
Quoted 1 line · Tabrez khan

Remove unnecessary braces {} for single while statement.

Your patch is fine Tabrez, but to the lustre folk:

drivers/staging/lustre/lustre/obdclass/cl_io.c

Quoted 1 line
drivers/staging/lustre/lustre/obdclass/cl_io.c +0 -0

[]

drivers/staging/lustre/lustre/obdclass/cl_io.c int cl_sync_io_wait(const struct lu_env *env, struct cl_sync_io *anchor,

Quoted 1 line
drivers/staging/lustre/lustre/obdclass/cl_io.c +0 -0
@@ -1371,9 +1371,9 @@ int cl_sync_io_wait(const struct lu_env *env, struct cl_sync_io *anchor,
	LASSERT(atomic_read(&anchor->csi_sync_nr) == 0);

	/* wait until cl_sync_io_note() has done wakeup */
drivers/staging/lustre/lustre/obdclass/cl_io.c +1 -1
-	while (unlikely(atomic_read(&anchor->csi_barrier) != 0)) {
+	while (unlikely(atomic_read(&anchor->csi_barrier) != 0))
		cpu_relax();
drivers/staging/lustre/lustre/obdclass/cl_io.c +1 -1
-	}
+
Quoted 2 lines

What if the wakeup never occurs/succeeds?
Should there be a timeout?

There is no wakeup at all. This piece of code is to solve the preempting race condition in cl_sync_io_end(), where it calls wake_up_all() to wake up the cl_sync_io_wait() process, and then is preempted _inside_ wake_up_all(), and then cl_sync_io_wait() process gains the CPU and frees memory cl_sync_io. Therefore when cl_sync_io_end() comes back to finish its work in wake_up_all(), a piece of freed memory will be accessed.

csi_barrier is proposed to solve this problem, which makes sure wake_up_all() is complete before cl_sync_io_wait() can continue. It should be a really short time so it?s reasonable for cl_sync_io_wait() to do a busy loop wait.

Jinshan

Quoted 4 lines

_______________________________________________
lustre-devel mailing list
lustre-devel at lists.lustre.org
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org