Commit cd02b966 authored by Vladimir V. Saveliev's avatar Vladimir V. Saveliev Committed by Linus Torvalds

[PATCH] reiserfs: cleanups

Clean up several places where gcc issues warnings when -W is specified.
Thanks to Neil for finding that.
Signed-off-by: default avatarVladimir V. Saveliev <vs@namesys.com>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarHans Reiser <reiser@namesys.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e6a67846
...@@ -191,9 +191,7 @@ static void create_virtual_node(struct tree_balance *tb, int h) ...@@ -191,9 +191,7 @@ static void create_virtual_node(struct tree_balance *tb, int h)
"vs-8045: create_virtual_node: rdkey %k, affected item==%d (mode==%c) Must be %c", "vs-8045: create_virtual_node: rdkey %k, affected item==%d (mode==%c) Must be %c",
key, vn->vn_affected_item_num, key, vn->vn_affected_item_num,
vn->vn_mode, M_DELETE); vn->vn_mode, M_DELETE);
} else }
/* we can delete directory item, that has only one directory entry in it */
;
} }
#endif #endif
......
...@@ -685,14 +685,14 @@ static const arg_desc_t logging_mode[] = { ...@@ -685,14 +685,14 @@ static const arg_desc_t logging_mode[] = {
(1 << REISERFS_DATA_ORDERED | 1 << REISERFS_DATA_WRITEBACK)}, (1 << REISERFS_DATA_ORDERED | 1 << REISERFS_DATA_WRITEBACK)},
{"writeback", 1 << REISERFS_DATA_WRITEBACK, {"writeback", 1 << REISERFS_DATA_WRITEBACK,
(1 << REISERFS_DATA_ORDERED | 1 << REISERFS_DATA_LOG)}, (1 << REISERFS_DATA_ORDERED | 1 << REISERFS_DATA_LOG)},
{NULL, 0} {.value = NULL}
}; };
/* possible values for -o barrier= */ /* possible values for -o barrier= */
static const arg_desc_t barrier_mode[] = { static const arg_desc_t barrier_mode[] = {
{"none", 1 << REISERFS_BARRIER_NONE, 1 << REISERFS_BARRIER_FLUSH}, {"none", 1 << REISERFS_BARRIER_NONE, 1 << REISERFS_BARRIER_FLUSH},
{"flush", 1 << REISERFS_BARRIER_FLUSH, 1 << REISERFS_BARRIER_NONE}, {"flush", 1 << REISERFS_BARRIER_FLUSH, 1 << REISERFS_BARRIER_NONE},
{NULL, 0} {.value = NULL}
}; };
/* possible values for "-o block-allocator=" and bits which are to be set in /* possible values for "-o block-allocator=" and bits which are to be set in
...@@ -890,7 +890,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin ...@@ -890,7 +890,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
{"acl",.setmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"acl",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"noacl",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT}, {"noacl",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
#endif #endif
{"nolog",}, /* This is unsupported */ {.option_name = "nolog"},
{"replayonly",.setmask = 1 << REPLAYONLY}, {"replayonly",.setmask = 1 << REPLAYONLY},
{"block-allocator",.arg_required = 'a',.values = balloc}, {"block-allocator",.arg_required = 'a',.values = balloc},
{"data",.arg_required = 'd',.values = logging_mode}, {"data",.arg_required = 'd',.values = logging_mode},
...@@ -908,7 +908,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin ...@@ -908,7 +908,7 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
{"grpjquota",.arg_required = {"grpjquota",.arg_required =
'g' | (1 << REISERFS_OPT_ALLOWEMPTY),.values = NULL}, 'g' | (1 << REISERFS_OPT_ALLOWEMPTY),.values = NULL},
{"jqfmt",.arg_required = 'f',.values = NULL}, {"jqfmt",.arg_required = 'f',.values = NULL},
{NULL,} {.option_name = NULL}
}; };
*blocks = 0; *blocks = 0;
......
...@@ -101,13 +101,13 @@ static inline void reiserfs_mark_inode_private(struct inode *inode) ...@@ -101,13 +101,13 @@ static inline void reiserfs_mark_inode_private(struct inode *inode)
#else #else
#define is_reiserfs_priv_object(inode) 0 #define is_reiserfs_priv_object(inode) 0
#define reiserfs_mark_inode_private(inode) #define reiserfs_mark_inode_private(inode) do {;} while(0)
#define reiserfs_getxattr NULL #define reiserfs_getxattr NULL
#define reiserfs_setxattr NULL #define reiserfs_setxattr NULL
#define reiserfs_listxattr NULL #define reiserfs_listxattr NULL
#define reiserfs_removexattr NULL #define reiserfs_removexattr NULL
#define reiserfs_write_lock_xattrs(sb) #define reiserfs_write_lock_xattrs(sb) do {;} while(0)
#define reiserfs_write_unlock_xattrs(sb) #define reiserfs_write_unlock_xattrs(sb) do {;} while(0)
#define reiserfs_read_lock_xattrs(sb) #define reiserfs_read_lock_xattrs(sb)
#define reiserfs_read_unlock_xattrs(sb) #define reiserfs_read_unlock_xattrs(sb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment