Skip to content

Commit 2a03ddb

Browse files
committed
pstore/blk: Move verify_size() macro out of function
There's no good reason for the verify_size macro to live inside the function. Move it up with the check_size() macro and fix indenting. Cc: Anton Vorontsov <[email protected]> Cc: Colin Cross <[email protected]> Cc: Tony Luck <[email protected]> Signed-off-by: Kees Cook <[email protected]>
1 parent 6eed261 commit 2a03ddb

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

fs/pstore/blk.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,17 @@ struct bdev_info {
108108
_##name_; \
109109
})
110110

111+
#define verify_size(name, alignsize, enabled) { \
112+
long _##name_; \
113+
if (enabled) \
114+
_##name_ = check_size(name, alignsize); \
115+
else \
116+
_##name_ = 0; \
117+
/* Synchronize module parameters with resuls. */ \
118+
name = _##name_ / 1024; \
119+
pstore_zone_info->name = _##name_; \
120+
}
121+
111122
static int __register_pstore_device(struct pstore_device_info *dev)
112123
{
113124
int ret;
@@ -143,21 +154,10 @@ static int __register_pstore_device(struct pstore_device_info *dev)
143154
if (!dev->flags)
144155
dev->flags = UINT_MAX;
145156

146-
#define verify_size(name, alignsize, enabled) { \
147-
long _##name_; \
148-
if (enabled) \
149-
_##name_ = check_size(name, alignsize); \
150-
else \
151-
_##name_ = 0; \
152-
name = _##name_ / 1024; \
153-
pstore_zone_info->name = _##name_; \
154-
}
155-
156157
verify_size(kmsg_size, 4096, dev->flags & PSTORE_FLAGS_DMESG);
157158
verify_size(pmsg_size, 4096, dev->flags & PSTORE_FLAGS_PMSG);
158159
verify_size(console_size, 4096, dev->flags & PSTORE_FLAGS_CONSOLE);
159160
verify_size(ftrace_size, 4096, dev->flags & PSTORE_FLAGS_FTRACE);
160-
#undef verify_size
161161

162162
pstore_zone_info->total_size = dev->total_size;
163163
pstore_zone_info->max_reason = max_reason;

0 commit comments

Comments
 (0)