Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Lu Hongfei <luhongfei@vivo.com>
To:     Namjae Jeon <linkinjeon@kernel.org>,
        Steve French <sfrench@samba.org>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Tom Talpey <tom@talpey.com>,
        linux-cifs@vger.kernel.org (open list:KERNEL SMB3 SERVER (KSMBD)),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH] smb: Change the return value of ksmbd_vfs_query_maximal_access to void
Date:   Wed, 31 May 2023 10:10:43 +0800
Message-Id: <20230531021043.39728-1-luhongfei@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hPhGJ6cOXBTaQdF/Pr1edcurFaHfCktQM2BTuDFPZQBzj40Z6v+P9bQJs1Wv?=
 =?us-ascii?Q?Js1z7AIF+jk/p46+vIy4GiPPhFUfkJslAI+QJivYZX7BFmdK7C0qZOCCdmr1?=
 =?us-ascii?Q?SXKNiDD2S9+q4sTkxMqZn1WBs7E5sAt6AYhZD0YcZxauTb55zRX+f53tdZ8c?=
 =?us-ascii?Q?kbWec967jRum3EcITyKVs8rJ1RjBEhWFnS0PkrsBWEjliahcoPH3dPHgjxye?=
 =?us-ascii?Q?9muu74BBL0QCTRRyTwHRv19qroupNOJbRBRLoDh3sQwdJdNofg5Oe/PfzrKD?=
 =?us-ascii?Q?LeQJGUvQKn/QP5MrXEnlVAXQ/V0k8yNzWIS0XR5g0W7YFitndpXRzUw/k4ZJ?=
 =?us-ascii?Q?4RGcjlfynm4E5K7U92GX1Sb30w+IIXqM3FHcxGRiPj0hETPHGKm3BRaRjHsR?=
 =?us-ascii?Q?uajnVlcpU/R8QGDcDNGRzJMK0ZCmMThTWNW+xYMQwuWk0WoLcvAZkkv0KP1d?=
 =?us-ascii?Q?/+FAY9Zp8/U82KhtnsdwFIHPLNWwMvOwUTq1KTNMB8Kk7c8m8PSJqCpsGiw/?=
 =?us-ascii?Q?UB4rIUc3NzQMEqwgqxVQbzyU+gwA+mGOQwS7WPbxvKoPoSVlaoF69unLeAY2?=
 =?us-ascii?Q?dDTPswjGnbms5oxGmpqk4uyiPLiSfccFh6Xm3gnzW6yRiEPjZMwvVyZ+gE3Y?=
 =?us-ascii?Q?oIAFnIiBe/waqANunjTpQJM+7XnlnTE6XhSlnxh69YHX/Fn6NMA3UPzVo22h?=
 =?us-ascii?Q?Y5EWr4oCrsc7F4LT3dGpbeo0Pi8sw8Bg+YybhcQU8Pa3pYmcRC+5QZlunL3i?=
 =?us-ascii?Q?5L8rR2mldB2X7Gvkr4hj9kMmB2Vu55Y5y8pgK9rwA0wG6R6DrrWyKiG1DQVb?=
 =?us-ascii?Q?gwVxeHU3ttUgciB0+NUlvcqR3V81uhLplzOHuS6AJ8W7fs+JnuLukZOH+Ntn?=
 =?us-ascii?Q?cx5gBSdEURERJM/IhZmSLFh1ZUCW8P+PSiH7Bnhp+1bT088HiuDR9gDDRN7C?=
 =?us-ascii?Q?P8bRuOk9+R2X2ic0PU0vApT7onDEqzj70gW1yqLQMGdsTUOSPJxDNMjP+ANb?=
 =?us-ascii?Q?qmb1WNKp/xw5hyZ9Y2//KNli40ZpWqRi7ZMFeMMVrOS97UkzpiiUNzHpHntx?=
 =?us-ascii?Q?z+G6yXgf3kabzz4J6C7QCW9dtvOLs5//EQFKE4+Qz191wvNz5Nz71S/wiegO?=
 =?us-ascii?Q?8LM6M3MAgppAoH62xmxbdFuJHCpv+sLC9218ADIvin7NwLGZ+VVWbnGdvsDZ?=
 =?us-ascii?Q?C7JAunLewdW+ROVbC1Kc/8czrz8aulNrIiM8H4krVxFf6ItILdQRbsw2TEfY?=
 =?us-ascii?Q?lwBVEWcTxMgtHAzBKzXY51eNyy/VD23I27jw8KYFArpZ9dSDc0+ULCciu9Bv?=
 =?us-ascii?Q?lq0uCKD+igSvt2Ov8krTIT0LDj2O0srkQh2P2aknnKPZnQ2bEwpBMDIsAPzc?=
 =?us-ascii?Q?GszXJF3Il3XFtO2ALFePSX0cQNc4e7a0xyijM2EEaqXMBueV3IUk88X3Cjhq?=
 =?us-ascii?Q?XWMnOdoobrR5r/atnXaVuqUbTkSAu/kgKD0T63Y2qQJyUFE3Shz+/PP76U3O?=
 =?us-ascii?Q?S8P6YzyaAWn9OgB7OsJRGYqV4cDStuEcFCm8nJptZKXLczcgb27GDznvnkcM?=
 =?us-ascii?Q?rdOG/Gv29eFjsc38CkwiqP0QjmFvi6wVH2QwZiyt?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 371359db-4401-4876-f80f-08db617c4457
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2023 02:10:55.5742
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jqvk6KWdgHkcr26bJQ4jE4ic55WbR8MNJxkvSSOHAD+DbOB0jfc+QSU4kggCXPDrpOvscXXEnx+/11vOg1lL+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB6042
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The return value of ksmbd_vfs_query_maximal_access is meaningless,
it is better to modify it to void.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 fs/smb/server/smb2pdu.c | 4 +---
 fs/smb/server/vfs.c     | 6 +-----
 fs/smb/server/vfs.h     | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 717bcd20545b..a2cf5df245c9
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -2831,11 +2831,9 @@ int smb2_open(struct ksmbd_work *work)
 		if (!file_present) {
 			daccess = cpu_to_le32(GENERIC_ALL_FLAGS);
 		} else {
-			rc = ksmbd_vfs_query_maximal_access(idmap,
+			ksmbd_vfs_query_maximal_access(idmap,
 							    path.dentry,
 							    &daccess);
-			if (rc)
-				goto err_out;
 			already_permitted = true;
 		}
 		maximal_access = daccess;
diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c
index 778c152708e4..3fcd849339e0
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -117,11 +117,9 @@ static int ksmbd_vfs_path_lookup_locked(struct ksmbd_share_config *share_conf,
 	return -ENOENT;
 }
 
-int ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
+void ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
 				   struct dentry *dentry, __le32 *daccess)
 {
-	int ret = 0;
-
 	*daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL);
 
 	if (!inode_permission(idmap, d_inode(dentry), MAY_OPEN | MAY_WRITE))
@@ -138,8 +136,6 @@ int ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
 
 	if (!inode_permission(idmap, d_inode(dentry->d_parent), MAY_EXEC | MAY_WRITE))
 		*daccess |= FILE_DELETE_LE;
-
-	return ret;
 }
 
 /**
diff --git a/fs/smb/server/vfs.h b/fs/smb/server/vfs.h
index a4ae89f3230d..68fe8347e1d5
--- a/fs/smb/server/vfs.h
+++ b/fs/smb/server/vfs.h
@@ -72,7 +72,7 @@ struct ksmbd_kstat {
 };
 
 int ksmbd_vfs_lock_parent(struct dentry *parent, struct dentry *child);
-int ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
+void ksmbd_vfs_query_maximal_access(struct mnt_idmap *idmap,
 				   struct dentry *dentry, __le32 *daccess);
 int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode);
 int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode);
-- 
2.39.0