aboutsummaryrefslogtreecommitdiffstats
path: root/fs/afs/server.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-31 03:56:28 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-31 03:56:28 -0400
commitbe859405487324ed548f1ba11dc949b8230ab991 (patch)
tree3893ac2ce3b212b100d9e1e1e3e2fc1fa0c3f47f /fs/afs/server.c
parent63779436ab4ad0867bcea53bf853b0004d7b895d (diff)
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 <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/server.c')
-rw-r--r--fs/afs/server.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/afs/server.c b/fs/afs/server.c
index 28f2451419e..f4909951667 100644
--- a/fs/afs/server.c
+++ b/fs/afs/server.c
@@ -105,7 +105,7 @@ struct afs_server *afs_lookup_server(struct afs_cell *cell,
105{ 105{
106 struct afs_server *server, *candidate; 106 struct afs_server *server, *candidate;
107 107
108 _enter("%p,"NIPQUAD_FMT, cell, NIPQUAD(addr->s_addr)); 108 _enter("%p,%pI4", cell, &addr->s_addr);
109 109
110 /* quick scan of the list to see if we already have the server */ 110 /* quick scan of the list to see if we already have the server */
111 read_lock(&cell->servers_lock); 111 read_lock(&cell->servers_lock);
@@ -168,9 +168,8 @@ found_server:
168server_in_two_cells: 168server_in_two_cells:
169 write_unlock(&cell->servers_lock); 169 write_unlock(&cell->servers_lock);
170 kfree(candidate); 170 kfree(candidate);
171 printk(KERN_NOTICE "kAFS:" 171 printk(KERN_NOTICE "kAFS: Server %pI4 appears to be in two cells\n",
172 " Server "NIPQUAD_FMT" appears to be in two cells\n", 172 addr);
173 NIPQUAD(*addr));
174 _leave(" = -EEXIST"); 173 _leave(" = -EEXIST");
175 return ERR_PTR(-EEXIST); 174 return ERR_PTR(-EEXIST);
176} 175}
@@ -184,7 +183,7 @@ struct afs_server *afs_find_server(const struct in_addr *_addr)
184 struct rb_node *p; 183 struct rb_node *p;
185 struct in_addr addr = *_addr; 184 struct in_addr addr = *_addr;
186 185
187 _enter(NIPQUAD_FMT, NIPQUAD(addr.s_addr)); 186 _enter("%pI4", &addr.s_addr);
188 187
189 read_lock(&afs_servers_lock); 188 read_lock(&afs_servers_lock);
190 189