diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-21 20:11:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:20 -0500 |
commit | a455589f181e60439c736c6c6a068bb7e6dc23f0 (patch) | |
tree | 48d377e7db8d21fd606ba8c84a72b95f3d23c10b /fs/cachefiles/namei.c | |
parent | 41d28bca2da4bd75a8915c1ccf2cacf7f4a2e531 (diff) |
assorted conversions to %p[dD]
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cachefiles/namei.c')
-rw-r--r-- | fs/cachefiles/namei.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index e12f189d539b..7f8e83f9d74e 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c | |||
@@ -102,8 +102,7 @@ static void cachefiles_mark_object_buried(struct cachefiles_cache *cache, | |||
102 | struct cachefiles_object *object; | 102 | struct cachefiles_object *object; |
103 | struct rb_node *p; | 103 | struct rb_node *p; |
104 | 104 | ||
105 | _enter(",'%*.*s'", | 105 | _enter(",'%pd'", dentry); |
106 | dentry->d_name.len, dentry->d_name.len, dentry->d_name.name); | ||
107 | 106 | ||
108 | write_lock(&cache->active_lock); | 107 | write_lock(&cache->active_lock); |
109 | 108 | ||
@@ -273,9 +272,7 @@ static int cachefiles_bury_object(struct cachefiles_cache *cache, | |||
273 | char nbuffer[8 + 8 + 1]; | 272 | char nbuffer[8 + 8 + 1]; |
274 | int ret; | 273 | int ret; |
275 | 274 | ||
276 | _enter(",'%*.*s','%*.*s'", | 275 | _enter(",'%pd','%pd'", dir, rep); |
277 | dir->d_name.len, dir->d_name.len, dir->d_name.name, | ||
278 | rep->d_name.len, rep->d_name.len, rep->d_name.name); | ||
279 | 276 | ||
280 | _debug("remove %p from %p", rep, dir); | 277 | _debug("remove %p from %p", rep, dir); |
281 | 278 | ||
@@ -597,8 +594,7 @@ lookup_again: | |||
597 | /* if we've found that the terminal object exists, then we need to | 594 | /* if we've found that the terminal object exists, then we need to |
598 | * check its attributes and delete it if it's out of date */ | 595 | * check its attributes and delete it if it's out of date */ |
599 | if (!object->new) { | 596 | if (!object->new) { |
600 | _debug("validate '%*.*s'", | 597 | _debug("validate '%pd'", next); |
601 | next->d_name.len, next->d_name.len, next->d_name.name); | ||
602 | 598 | ||
603 | ret = cachefiles_check_object_xattr(object, auxdata); | 599 | ret = cachefiles_check_object_xattr(object, auxdata); |
604 | if (ret == -ESTALE) { | 600 | if (ret == -ESTALE) { |
@@ -827,8 +823,8 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache, | |||
827 | unsigned long start; | 823 | unsigned long start; |
828 | int ret; | 824 | int ret; |
829 | 825 | ||
830 | //_enter(",%*.*s/,%s", | 826 | //_enter(",%pd/,%s", |
831 | // dir->d_name.len, dir->d_name.len, dir->d_name.name, filename); | 827 | // dir, filename); |
832 | 828 | ||
833 | /* look up the victim */ | 829 | /* look up the victim */ |
834 | mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); | 830 | mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT); |
@@ -910,8 +906,7 @@ int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir, | |||
910 | struct dentry *victim; | 906 | struct dentry *victim; |
911 | int ret; | 907 | int ret; |
912 | 908 | ||
913 | _enter(",%*.*s/,%s", | 909 | _enter(",%pd/,%s", dir, filename); |
914 | dir->d_name.len, dir->d_name.len, dir->d_name.name, filename); | ||
915 | 910 | ||
916 | victim = cachefiles_check_active(cache, dir, filename); | 911 | victim = cachefiles_check_active(cache, dir, filename); |
917 | if (IS_ERR(victim)) | 912 | if (IS_ERR(victim)) |
@@ -969,8 +964,8 @@ int cachefiles_check_in_use(struct cachefiles_cache *cache, struct dentry *dir, | |||
969 | { | 964 | { |
970 | struct dentry *victim; | 965 | struct dentry *victim; |
971 | 966 | ||
972 | //_enter(",%*.*s/,%s", | 967 | //_enter(",%pd/,%s", |
973 | // dir->d_name.len, dir->d_name.len, dir->d_name.name, filename); | 968 | // dir, filename); |
974 | 969 | ||
975 | victim = cachefiles_check_active(cache, dir, filename); | 970 | victim = cachefiles_check_active(cache, dir, filename); |
976 | if (IS_ERR(victim)) | 971 | if (IS_ERR(victim)) |