ksmbd: remove generic_fillattr use in smb2_open()

[ Upstream commit 823d0d3e2b05791ba8cbab22574b947c21f89c18 ]

Removed the use of unneeded generic_fillattr() in smb2_open().

Reviewed-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
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 162b54214c90635bce6e0dbf9a585f0389fc1f66..f21af1f574917f03133d5411111a6912ad24fcd3 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -2809,7 +2809,6 @@ int smb2_open(struct ksmbd_work *work)
        } else {
                file_present = true;
                user_ns = mnt_user_ns(path.mnt);
-               generic_fillattr(user_ns, d_inode(path.dentry), &stat);
        }
        if (stream_name) {
                if (req->CreateOptions & FILE_DIRECTORY_FILE_LE) {
@@ -2818,7 +2817,8 @@ int smb2_open(struct ksmbd_work *work)
                                rsp->hdr.Status = STATUS_NOT_A_DIRECTORY;
                        }
                } else {
-                       if (S_ISDIR(stat.mode) && s_type == DATA_STREAM) {
+                       if (file_present && S_ISDIR(d_inode(path.dentry)->i_mode) &&
+                           s_type == DATA_STREAM) {
                                rc = -EIO;
                                rsp->hdr.Status = STATUS_FILE_IS_A_DIRECTORY;
                        }
@@ -2835,7 +2835,8 @@ int smb2_open(struct ksmbd_work *work)
        }
 
        if (file_present && req->CreateOptions & FILE_NON_DIRECTORY_FILE_LE &&
-           S_ISDIR(stat.mode) && !(req->CreateOptions & FILE_DELETE_ON_CLOSE_LE)) {
+           S_ISDIR(d_inode(path.dentry)->i_mode) &&
+           !(req->CreateOptions & FILE_DELETE_ON_CLOSE_LE)) {
                ksmbd_debug(SMB, "open() argument is a directory: %s, %x\n",
                            name, req->CreateOptions);
                rsp->hdr.Status = STATUS_FILE_IS_A_DIRECTORY;
@@ -2845,7 +2846,7 @@ int smb2_open(struct ksmbd_work *work)
 
        if (file_present && (req->CreateOptions & FILE_DIRECTORY_FILE_LE) &&
            !(req->CreateDisposition == FILE_CREATE_LE) &&
-           !S_ISDIR(stat.mode)) {
+           !S_ISDIR(d_inode(path.dentry)->i_mode)) {
                rsp->hdr.Status = STATUS_NOT_A_DIRECTORY;
                rc = -EIO;
                goto err_out;