ksmbd: don't open-code %pD

[ Upstream commit 369c1634cc7ae8645a5cba4c7eb874755c2a6a07 ]

a bunch of places used %pd with file->f_path.dentry; shorter (and saner)
way to spell that is %pD with file...

Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index b0d05500bfaa88bc6a39c62d432874dd9b64e98a..83513f8006afe7f5dbc3d3a892eb8c88cb30a5a0 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -3939,8 +3939,7 @@ int smb2_query_dir(struct ksmbd_work *work)
            inode_permission(file_mnt_user_ns(dir_fp->filp),
                             file_inode(dir_fp->filp),
                             MAY_READ | MAY_EXEC)) {
-               pr_err("no right to enumerate directory (%pd)\n",
-                      dir_fp->filp->f_path.dentry);
+               pr_err("no right to enumerate directory (%pD)\n", dir_fp->filp);
                rc = -EACCES;
                goto err_out2;
        }
@@ -6309,8 +6308,8 @@ int smb2_read(struct ksmbd_work *work)
                goto out;
        }
 
-       ksmbd_debug(SMB, "filename %pd, offset %lld, len %zu\n",
-                   fp->filp->f_path.dentry, offset, length);
+       ksmbd_debug(SMB, "filename %pD, offset %lld, len %zu\n",
+                   fp->filp, offset, length);
 
        work->aux_payload_buf = kvmalloc(length, GFP_KERNEL | __GFP_ZERO);
        if (!work->aux_payload_buf) {
@@ -6574,8 +6573,8 @@ int smb2_write(struct ksmbd_work *work)
                data_buf = (char *)(((char *)&req->hdr.ProtocolId) +
                                    le16_to_cpu(req->DataOffset));
 
-               ksmbd_debug(SMB, "filename %pd, offset %lld, len %zu\n",
-                           fp->filp->f_path.dentry, offset, length);
+               ksmbd_debug(SMB, "filename %pD, offset %lld, len %zu\n",
+                           fp->filp, offset, length);
                err = ksmbd_vfs_write(work, fp, data_buf, length, &offset,
                                      writethrough, &nbytes);
                if (err < 0)

diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c
index 0092e6911b14f8719670a338084e5bf4ccfa93c0..8c542581f62a4972ba3b8d77be60c241bef14d1e 100644 (file)
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@ -376,8 +376,7 @@ int ksmbd_vfs_read(struct ksmbd_work *work, struct ksmbd_file *fp, size_t count,
 
        if (work->conn->connection_type) {
                if (!(fp->daccess & (FILE_READ_DATA_LE | FILE_EXECUTE_LE))) {
-                       pr_err("no right to read(%pd)\n",
-                              fp->filp->f_path.dentry);
+                       pr_err("no right to read(%pD)\n", fp->filp);
                        return -EACCES;
                }
        }
@@ -486,8 +485,7 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp,
 
        if (work->conn->connection_type) {
                if (!(fp->daccess & FILE_WRITE_DATA_LE)) {
-                       pr_err("no right to write(%pd)\n",
-                              fp->filp->f_path.dentry);
+                       pr_err("no right to write(%pD)\n", fp->filp);
                        err = -EACCES;
                        goto out;
                }
@@ -526,8 +524,8 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp,
        if (sync) {
                err = vfs_fsync_range(filp, offset, offset + *written, 0);
                if (err < 0)
-                       pr_err("fsync failed for filename = %pd, err = %d\n",
-                              fp->filp->f_path.dentry, err);
+                       pr_err("fsync failed for filename = %pD, err = %d\n",
+                              fp->filp, err);
        }
 
 out:
@@ -1742,11 +1740,11 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work,
        *total_size_written = 0;
 
        if (!(src_fp->daccess & (FILE_READ_DATA_LE | FILE_EXECUTE_LE))) {
-               pr_err("no right to read(%pd)\n", src_fp->filp->f_path.dentry);
+               pr_err("no right to read(%pD)\n", src_fp->filp);
                return -EACCES;
        }
        if (!(dst_fp->daccess & (FILE_WRITE_DATA_LE | FILE_APPEND_DATA_LE))) {
-               pr_err("no right to write(%pd)\n", dst_fp->filp->f_path.dentry);
+               pr_err("no right to write(%pD)\n", dst_fp->filp);
                return -EACCES;
        }