b=20668

i=rread,rahul
Removed trailing semicolons from trailing "} while (0)" in multiline
macro definitions

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch
index 9a1c521..192f5c8 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.15.patch
@@ -2715,7 +2715,7 @@ Index: linux-2.6.16.21-0.8/include/linux/ext3_extents.h
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \

-+} while (0);
++} while (0)

 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif
 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch
index 5b363ea..a42a680 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch
@@ -2592,7 +2592,7 @@ Index: linux-2.6.16.54-0.2.5/include/linux/ext3_extents.h
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \

-+} while (0);
++} while (0)

 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif
 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
index 27cfe46..8131d96 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
@@ -2543,7 +2543,7 @@ Index: linux-2.6.18.8/include/linux/ext3_extents.h
 +do {                                                    \
 +      if (test_opt(inode->i_sb, EXTDEBUG))             \
 +              printk(fmt, ##a);                        \
 +do {                                                    \
 +      if (test_opt(inode->i_sb, EXTDEBUG))             \
 +              printk(fmt, ##a);                        \

-+} while (0);
++} while (0)

 +#else
 +#define ext_debug(inode,fmt,a...)
 +#endif
 +#else
 +#define ext_debug(inode,fmt,a...)
 +#endif

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch
index f0358a6..9bd5ec3 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla.patch
@@ -2544,7 +2544,7 @@ Index: linux-2.6.18.8/include/linux/ext3_extents.h
 +do {                                                    \
 +      if (test_opt(inode->i_sb, EXTDEBUG))             \
 +              printk(fmt, ##a);                        \
 +do {                                                    \
 +      if (test_opt(inode->i_sb, EXTDEBUG))             \
 +              printk(fmt, ##a);                        \

-+} while (0);
++} while (0)

 +#else
 +#define ext_debug(inode,fmt,a...)
 +#endif
 +#else
 +#define ext_debug(inode,fmt,a...)
 +#endif

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch
index de538f0..cb9ddc3 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.5.patch
@@ -2577,7 +2577,7 @@ Index: linux-2.6.5-7.311/include/linux/ext3_extents.h
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \

-+} while (0);
++} while (0)

 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif
 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif

diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
index 655d665..7417c77 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.9-rhel4.patch
@@ -2573,7 +2573,7 @@ Index: linux-2.6.9-67.0.20/include/linux/ext3_extents.h
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \
 +do {                                                  \
 +      if (test_opt((tree)->inode->i_sb, EXTDEBUG))    \
 +              printk(fmt, ##a);                       \

-+} while (0);
++} while (0)

 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif
 +#else
 +#define ext_debug(tree,fmt,a...)
 +#endif

diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h
index 0f0fed6..5fd6494 100644 (file)
--- a/libcfs/include/libcfs/libcfs_debug.h
+++ b/libcfs/include/libcfs/libcfs_debug.h
@@ -340,7 +340,7 @@ extern int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls,
         if (cdebug_show(mask, DEBUG_SUBSYSTEM))                               \
                 libcfs_debug_vmsg(cdls, DEBUG_SUBSYSTEM, (mask),              \
                                   (file), (func), (line), fmt, args);         \
         if (cdebug_show(mask, DEBUG_SUBSYSTEM))                               \
                 libcfs_debug_vmsg(cdls, DEBUG_SUBSYSTEM, (mask),              \
                                   (file), (func), (line), fmt, args);         \

-} while(0);
+} while(0)

 
 #define cdebug(cdls, mask, file, func, line, fmt, ...) do {                   \
         CHECK_STACK();                                                        \
 
 #define cdebug(cdls, mask, file, func, line, fmt, ...) do {                   \
         CHECK_STACK();                                                        \


@@ -348,7 +348,7 @@ extern int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls,
         if (cdebug_show(mask, DEBUG_SUBSYSTEM))                               \
                 libcfs_debug_msg(cdls, DEBUG_SUBSYSTEM, (mask),               \
                                  (file), (func), (line), fmt, ## __VA_ARGS__);\
         if (cdebug_show(mask, DEBUG_SUBSYSTEM))                               \
                 libcfs_debug_msg(cdls, DEBUG_SUBSYSTEM, (mask),               \
                                  (file), (func), (line), fmt, ## __VA_ARGS__);\

-} while(0);
+} while(0)

 
 extern void libcfs_assertion_failed(const char *expr, const char *file,
                                     const char *fn, const int line);
 
 extern void libcfs_assertion_failed(const char *expr, const char *file,
                                     const char *fn, const int line);

diff --git a/libsysio/drivers/yod/fs_yod.c b/libsysio/drivers/yod/fs_yod.c
index 56a9f66..ea0ce35 100644 (file)
--- a/libsysio/drivers/yod/fs_yod.c
+++ b/libsysio/drivers/yod/fs_yod.c
@@ -103,7 +103,7 @@ do {                                            \
        (dest)->st_blocks  = (src)->st_blocks;  \
        (dest)->st_flags   = (src)->st_flags;   \
        (dest)->st_gen     = (src)->st_gen;     \
        (dest)->st_blocks  = (src)->st_blocks;  \
        (dest)->st_flags   = (src)->st_flags;   \
        (dest)->st_gen     = (src)->st_gen;     \

-} while (0);
+} while (0)

 #else
 #define COPY_STAT(src, dest)                    \
 do {                                            \
 #else
 #define COPY_STAT(src, dest)                    \
 do {                                            \


@@ -121,7 +121,7 @@ do {                                            \
        (dest)->st_ctime   = (src)->st_ctime;   \
        (dest)->st_blksize = (src)->st_blksize; \
        (dest)->st_blocks  = (src)->st_blocks;  \
        (dest)->st_ctime   = (src)->st_ctime;   \
        (dest)->st_blksize = (src)->st_blksize; \
        (dest)->st_blocks  = (src)->st_blocks;  \

-} while (0);
+} while (0)

 #endif
 
 /*
 #endif
 
 /*

diff --git a/libsysio/include/native.h b/libsysio/include/native.h
index d0c024b..0aeab3c 100644 (file)
--- a/libsysio/include/native.h
+++ b/libsysio/include/native.h
@@ -87,7 +87,7 @@ do {                                            \
        (dest)->st_blocks  = (src)->st_blocks;  \
        (dest)->st_flags   = (src)->st_flags;   \
        (dest)->st_gen     = (src)->st_gen;     \
        (dest)->st_blocks  = (src)->st_blocks;  \
        (dest)->st_flags   = (src)->st_flags;   \
        (dest)->st_gen     = (src)->st_gen;     \

-} while (0);
+} while (0)

 
 #else 
 #define _sysio_native_stat intnl_stat
 
 #else 
 #define _sysio_native_stat intnl_stat

diff --git a/libsysio/src/init.c b/libsysio/src/init.c
index 470b5c2..0708a96 100644 (file)
--- a/libsysio/src/init.c
+++ b/libsysio/src/init.c
@@ -104,7 +104,7 @@ struct trace_callback {
                (__tcb)->f = (__f); \
                (__tcb)->data = (__d); \
                (__tcb)->destructor = (__destroy); \
                (__tcb)->f = (__f); \
                (__tcb)->data = (__d); \
                (__tcb)->destructor = (__destroy); \

-       } while (0);
+       } while (0)

 
 /*
  * Trace queue head record.
 
 /*
  * Trace queue head record.

diff --git a/lustre/kernel_patches/patches/mtd-2.6-suse-lnxi.patch b/lustre/kernel_patches/patches/mtd-2.6-suse-lnxi.patch
index 85b2ca2..a84e273 100644 (file)
--- a/lustre/kernel_patches/patches/mtd-2.6-suse-lnxi.patch
+++ b/lustre/kernel_patches/patches/mtd-2.6-suse-lnxi.patch
@@ -18337,7 +18337,7 @@ Index: linux-2.6.5/drivers/mtd/maps/wr_sbc82xx_flash.c
 +      case 0x00001000:        (map).bankwidth = 2;    break;  \
 +      case 0x00001800:        (map).bankwidth = 4;    break;  \
 +      }                                                       \
 +      case 0x00001000:        (map).bankwidth = 2;    break;  \
 +      case 0x00001800:        (map).bankwidth = 4;    break;  \
 +      }                                                       \

-+} while (0);
++} while (0)

 +
 +int __init init_sbc82xx_flash(void)
 +{
 +
 +int __init init_sbc82xx_flash(void)
 +{

diff --git a/lustre/llite/vvp_dev.c b/lustre/llite/vvp_dev.c
index 3940252..6549139 100644 (file)
--- a/lustre/llite/vvp_dev.c
+++ b/lustre/llite/vvp_dev.c
@@ -404,7 +404,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                 seq_printf(seq, "%s"#flag, has_flags ? "|" : "");       \
                 has_flags = 1;                                          \
         }                                                               \
                 seq_printf(seq, "%s"#flag, has_flags ? "|" : "");       \
                 has_flags = 1;                                          \
         }                                                               \

-} while(0);
+} while(0)

 
 static void vvp_pgcache_page_show(const struct lu_env *env,
                                   struct seq_file *seq, struct cl_page *page)
 
 static void vvp_pgcache_page_show(const struct lu_env *env,
                                   struct seq_file *seq, struct cl_page *page)