mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
fs: replace NIPQUAD()
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u can be replaced with %pI4 Signed-off-by: Harvey Harrison <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
63779436ab
commit
be85940548
13 changed files with 39 additions and 43 deletions
|
|
@ -646,7 +646,7 @@ static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v)
|
|||
}
|
||||
|
||||
/* display one cell per line on subsequent lines */
|
||||
seq_printf(m, "%u.%u.%u.%u\n", NIPQUAD(addr->s_addr));
|
||||
seq_printf(m, "%pI4\n", &addr->s_addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -737,7 +737,7 @@ static int afs_proc_cell_servers_show(struct seq_file *m, void *v)
|
|||
}
|
||||
|
||||
/* display one cell per line on subsequent lines */
|
||||
sprintf(ipaddr, "%u.%u.%u.%u", NIPQUAD(server->addr));
|
||||
sprintf(ipaddr, "%pI4", &server->addr);
|
||||
seq_printf(m, "%3d %-15.15s %5d\n",
|
||||
atomic_read(&server->usage), ipaddr, server->fs_state);
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ struct afs_server *afs_lookup_server(struct afs_cell *cell,
|
|||
{
|
||||
struct afs_server *server, *candidate;
|
||||
|
||||
_enter("%p,"NIPQUAD_FMT, cell, NIPQUAD(addr->s_addr));
|
||||
_enter("%p,%pI4", cell, &addr->s_addr);
|
||||
|
||||
/* quick scan of the list to see if we already have the server */
|
||||
read_lock(&cell->servers_lock);
|
||||
|
|
@ -168,9 +168,8 @@ found_server:
|
|||
server_in_two_cells:
|
||||
write_unlock(&cell->servers_lock);
|
||||
kfree(candidate);
|
||||
printk(KERN_NOTICE "kAFS:"
|
||||
" Server "NIPQUAD_FMT" appears to be in two cells\n",
|
||||
NIPQUAD(*addr));
|
||||
printk(KERN_NOTICE "kAFS: Server %pI4 appears to be in two cells\n",
|
||||
addr);
|
||||
_leave(" = -EEXIST");
|
||||
return ERR_PTR(-EEXIST);
|
||||
}
|
||||
|
|
@ -184,7 +183,7 @@ struct afs_server *afs_find_server(const struct in_addr *_addr)
|
|||
struct rb_node *p;
|
||||
struct in_addr addr = *_addr;
|
||||
|
||||
_enter(NIPQUAD_FMT, NIPQUAD(addr.s_addr));
|
||||
_enter("%pI4", &addr.s_addr);
|
||||
|
||||
read_lock(&afs_servers_lock);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue