From f40a7f3e3888b42a43674b099e5470022c8c544c Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Jul 2007 11:07:56 -0500
Subject: [PATCH] fs/: Remove lingering references to CFG_CMD_* symbols.
Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
fs/ext2/dev.c | 2 +-
fs/ext2/ext2fs.c | 2 +-
fs/jffs2/compr_rtime.c | 2 +-
fs/jffs2/compr_rubin.c | 2 +-
fs/jffs2/compr_zlib.c | 2 +-
fs/jffs2/jffs2_1pass.c | 2 +-
fs/jffs2/jffs2_nand_1pass.c | 2 +-
fs/jffs2/mini_inflate.c | 2 +-
fs/reiserfs/dev.c | 2 +-
fs/reiserfs/mode_string.c | 2 +-
fs/reiserfs/reiserfs.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
index 49a55b90e2..643a1a8c85 100644
--- a/fs/ext2/dev.c
+++ b/fs/ext2/dev.c
@@ -123,4 +123,4 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
}
return (1);
}
-#endif /* CFG_CMD_EXT2FS */
+#endif
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index e65e39b5ab..513a2f9e32 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -875,4 +875,4 @@ fail:
return (0);
}
-#endif /* CFG_CMD_EXT2FS */
+#endif
diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
index cb132118ae..144263c422 100644
--- a/fs/jffs2/compr_rtime.c
+++ b/fs/jffs2/compr_rtime.c
@@ -88,4 +88,4 @@ void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
}
}
-#endif /* CFG_CMD_JFFS2 */
+#endif
diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
index 7a612c9192..f6f3fa1b58 100644
--- a/fs/jffs2/compr_rubin.c
+++ b/fs/jffs2/compr_rubin.c
@@ -123,4 +123,4 @@ void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out,
rubin_do_decompress(bits, data_in+8, cpage_out, dstlen);
}
-#endif /* CFG_CMD_JFFS2 */
+#endif
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c
index 78b12a34a4..29dfe1b664 100644
--- a/fs/jffs2/compr_zlib.c
+++ b/fs/jffs2/compr_zlib.c
@@ -49,4 +49,4 @@ long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out,
}
-#endif /* CFG_CMD_JFFS2 */
+#endif
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 0d6d673164..53166683fd 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -1397,4 +1397,4 @@ jffs2_1pass_info(struct part_info * part)
return 1;
}
-#endif /* CFG_CMD_JFFS2 */
+#endif
diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c
index 08885f08a7..3a4c64985a 100644
--- a/fs/jffs2/jffs2_nand_1pass.c
+++ b/fs/jffs2/jffs2_nand_1pass.c
@@ -1033,4 +1033,4 @@ jffs2_1pass_info(struct part_info * part)
return 1;
}
-#endif /* CFG_CMD_JFFS2 */
+#endif
diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c
index f2b8762856..4c50fc32dc 100644
--- a/fs/jffs2/mini_inflate.c
+++ b/fs/jffs2/mini_inflate.c
@@ -393,4 +393,4 @@ long decompress_block(unsigned char *dest, unsigned char *source,
return stream.error ? -stream.error : stream.decoded;
}
-#endif /* CFG_CMD_JFFS2 */
+#endif
diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c
index 66f927c642..6b36c06b5c 100644
--- a/fs/reiserfs/dev.c
+++ b/fs/reiserfs/dev.c
@@ -120,4 +120,4 @@ int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
return 1;
}
-#endif /* CFG_CMD_REISERFS */
+#endif
diff --git a/fs/reiserfs/mode_string.c b/fs/reiserfs/mode_string.c
index 8bf6bf0e94..ae98834df4 100644
--- a/fs/reiserfs/mode_string.c
+++ b/fs/reiserfs/mode_string.c
@@ -139,4 +139,4 @@ const char *bb_mode_string(int mode)
#endif
-#endif /* CFG_CMD_REISER */
+#endif
diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c
index c6ab22647a..aa96361638 100644
--- a/fs/reiserfs/reiserfs.c
+++ b/fs/reiserfs/reiserfs.c
@@ -983,4 +983,4 @@ reiserfs_open (char *filename)
return filemax;
}
-#endif /* CFG_CMD_REISER */
+#endif
--
GitLab