mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
relay: use macro PAGE_ALIGN instead of FIX_SIZE
Macro FIX_SIZE is same as PAGE_ALIGN at present, so use PAGE_ALIGN instead. Thanks Andrew found this. Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Eric Dumazet <edumazet@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
536b39ecf1
commit
a05342cbd6
@ -550,9 +550,6 @@ static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
|
||||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
/* Needs a _much_ better name... */
|
||||
#define FIX_SIZE(x) ((((x) - 1) & PAGE_MASK) + PAGE_SIZE)
|
||||
|
||||
/**
|
||||
* relay_open - create a new relay channel
|
||||
* @base_filename: base name of files to create, %NULL for buffering only
|
||||
@ -591,7 +588,7 @@ struct rchan *relay_open(const char *base_filename,
|
||||
chan->version = RELAYFS_CHANNEL_VERSION;
|
||||
chan->n_subbufs = n_subbufs;
|
||||
chan->subbuf_size = subbuf_size;
|
||||
chan->alloc_size = FIX_SIZE(subbuf_size * n_subbufs);
|
||||
chan->alloc_size = PAGE_ALIGN(subbuf_size * n_subbufs);
|
||||
chan->parent = parent;
|
||||
chan->private_data = private_data;
|
||||
if (base_filename) {
|
||||
|
Loading…
Reference in New Issue
Block a user