diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 10:44:55 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 10:44:55 -0400 |
commit | 73e8fb2d596d5903cde6dcced39c0b88b5770a56 (patch) | |
tree | 27c63346b888ce8f086a81ad801755bc1d4aa2d8 /drivers/staging/lustre | |
parent | 33e09f0ee76e9e4108c5aed67e027ef5e3fe0634 (diff) | |
parent | 3baf32898e1c88792fa7cadc88f601833bdae3da (diff) | |
download | linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.tar.gz linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.tar.bz2 linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.zip |
Merge branch 'work.const-qstr' into work.misc
Diffstat (limited to 'drivers/staging/lustre')
-rw-r--r-- | drivers/staging/lustre/lustre/llite/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index 57281b9e31ff..23249b3e6cad 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -1141,8 +1141,8 @@ ll_file_io_generic(const struct lu_env *env, struct vvp_io_args *args, struct cl_io *io; ssize_t result; - CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zd\n", - file->f_path.dentry->d_name.name, iot, *ppos, count); + CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n", + file, iot, *ppos, count); restart: io = vvp_env_thread_io(env); |