summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4recover.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
-rw-r--r--fs/nfsd/nfs4recover.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index e0a65a9e37e9..9c271f42604a 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -385,8 +385,8 @@ purge_old(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)
385 385
386 status = vfs_rmdir(parent->d_inode, child); 386 status = vfs_rmdir(parent->d_inode, child);
387 if (status) 387 if (status)
388 printk("failed to remove client recovery directory %s\n", 388 printk("failed to remove client recovery directory %pd\n",
389 child->d_name.name); 389 child);
390 /* Keep trying, success or failure: */ 390 /* Keep trying, success or failure: */
391 return 0; 391 return 0;
392} 392}
@@ -410,15 +410,15 @@ out:
410 nfs4_release_reclaim(nn); 410 nfs4_release_reclaim(nn);
411 if (status) 411 if (status)
412 printk("nfsd4: failed to purge old clients from recovery" 412 printk("nfsd4: failed to purge old clients from recovery"
413 " directory %s\n", nn->rec_file->f_path.dentry->d_name.name); 413 " directory %pD\n", nn->rec_file);
414} 414}
415 415
416static int 416static int
417load_recdir(struct dentry *parent, struct dentry *child, struct nfsd_net *nn) 417load_recdir(struct dentry *parent, struct dentry *child, struct nfsd_net *nn)
418{ 418{
419 if (child->d_name.len != HEXDIR_LEN - 1) { 419 if (child->d_name.len != HEXDIR_LEN - 1) {
420 printk("nfsd4: illegal name %s in recovery directory\n", 420 printk("nfsd4: illegal name %pd in recovery directory\n",
421 child->d_name.name); 421 child);
422 /* Keep trying; maybe the others are OK: */ 422 /* Keep trying; maybe the others are OK: */
423 return 0; 423 return 0;
424 } 424 }
@@ -437,7 +437,7 @@ nfsd4_recdir_load(struct net *net) {
437 status = nfsd4_list_rec_dir(load_recdir, nn); 437 status = nfsd4_list_rec_dir(load_recdir, nn);
438 if (status) 438 if (status)
439 printk("nfsd4: failed loading clients from recovery" 439 printk("nfsd4: failed loading clients from recovery"
440 " directory %s\n", nn->rec_file->f_path.dentry->d_name.name); 440 " directory %pD\n", nn->rec_file);
441 return status; 441 return status;
442} 442}
443 443