]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ksmbd: remove generic_fillattr use in smb2_open()
authorNamjae Jeon <linkinjeon@kernel.org>
Tue, 30 Aug 2022 14:01:18 +0000 (23:01 +0900)
committerSteve French <stfrench@microsoft.com>
Wed, 5 Oct 2022 06:15:37 +0000 (01:15 -0500)
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>
fs/ksmbd/smb2pdu.c

index 69d9fad01683a55115d85191b0cd2d22252061fb..ba74aba2f1d38147acfa8debe58adbda9b214981 100644 (file)
@@ -2761,7 +2761,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) {
@@ -2770,7 +2769,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;
                        }
@@ -2787,7 +2787,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;
@@ -2797,7 +2798,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;