Skip to contentSkip to conversation

relay: use macro PAGE_ALIGN instead of FIX_SIZE

PATCH New zhangwei(Jovi) 1 participant 1 message Mar 20, 2013 Relay

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 kernel/relay.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
kernel/relay.c +1 -4
index d0c638f..5666dad 100644
@@ -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) {
Signature · 1 line
1.7.9.7