1 files changed, 4 insertions, 5 deletions

diff --git a/fs/nilfs2/the_nilfs.h b/fs/nilfs2/the_nilfs.h
index 06d2548d436d..79369fd6b13b 100644
--- a/fs/nilfs2/the_nilfs.h
+++ b/fs/nilfs2/the_nilfs.h
@@ -222,15 +222,14 @@ THE_NILFS_FNS(SB_DIRTY, sb_dirty)
  * Mount option operations
  */
 #define nilfs_clear_opt(nilfs, opt)  \
-        do { (nilfs)->ns_mount_opt &= ~NILFS_MOUNT_##opt; } while (0)
+        ((nilfs)->ns_mount_opt &= ~NILFS_MOUNT_##opt)
 #define nilfs_set_opt(nilfs, opt)  \
-        do { (nilfs)->ns_mount_opt |= NILFS_MOUNT_##opt; } while (0)
+        ((nilfs)->ns_mount_opt |= NILFS_MOUNT_##opt)
 #define nilfs_test_opt(nilfs, opt) ((nilfs)->ns_mount_opt & NILFS_MOUNT_##opt)
 #define nilfs_write_opt(nilfs, mask, opt)                               \
-        do { (nilfs)->ns_mount_opt =                                    \
+        ((nilfs)->ns_mount_opt =                                        \
                 (((nilfs)->ns_mount_opt & ~NILFS_MOUNT_##mask) |        \
-                 NILFS_MOUNT_##opt);                                    \
-        } while (0)
+                 NILFS_MOUNT_##opt))                                    \
 
 /**
  * struct nilfs_root - nilfs root object