UML - Replace one-element array with zero-element array
PATCH 4/4 UML - Replace one-element array with zero-element array
From: Paolo 'Blaisorblade' Giarrusso <[email protected]>
To look at users I did:
$ find arch/um/ include/asm-um -name '*.[ch]'|xargs grep -r 'net_kern\.h' +-l|xargs grep '\<user\>'
Most users just cast user to the appropriate pointer, the remaining ones are fixed here. In net_kern.c, I'm almost sure that save trick is not needed anymore, but I've not verified it.
--
arch/um/drivers/net_kern.c | 14 +++----------- arch/um/include/net_kern.h | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-)
arch/um/drivers/net_kern.c +3 -11
@@ -347,10 +347,9 @@ static void eth_configure(int n, void *istruct uml_net *device;struct net_device *dev;struct uml_net_private *lp; -int save, err, size; +int err, size; - size = transport->private_size +sizeof (struct uml_net_private ) + -sizeof (((struct uml_net_private *)0 )->user); + size = transport->private_size +sizeof (struct uml_net_private ); device =kzalloc (sizeof (*device),GFP_KERNEL );if (device ==NULL ) {
@@ -409,12 +408,6 @@ static void eth_configure(int n, void *i*/ (*transport->kern->init)(dev, init); -/* lp.user is the first four bytes of the transport data, which -* has already been initialized. This structure assignment will -* overwrite that, so we make sure that .user gets overwritten with -* what it already has. -*/ - save = lp->user[0 ]; *lp = ((struct uml_net_private) { .list = LIST_HEAD_INIT(lp->list), .dev = dev,
@@ -428,8 +421,7 @@ static void eth_configure(int n, void *i .write = transport->kern->write, .add_address = transport->user->add_address, .delete_address = transport->user->delete_address, - .set_mtu = transport->user->set_mtu, - .user = { save } }); + .set_mtu = transport->user->set_mtu });init_timer (&lp->tl);spin_lock_init (&lp->lock);
arch/um/include/net_kern.h +1 -1
@@ -40,7 +40,7 @@ struct uml_net_private {void (*add_address)(unsigned char *,unsigned char *,void *);void (*delete_address)(unsigned char *,unsigned char *,void *);int (*set_mtu)(int mtu,void *); -int user[1 ]; +char user[0 ]; };struct net_kern_info {
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel