From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 586B33D3498 for ; Wed, 24 Jun 2026 14:52:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782312781; cv=none; b=Njkscu9R1zFx2u/Ftspp4slhygE06S5wwVYlfyNyGKyV3ue/lNLxaccf9Fmqw4ftmAX39NhLHiR/krSzhoxAFhUwDRpaVBdgZCzHxCSJLQ54z/Rdy2FH9+heQAxuXkxrtWYq38rZFJ69CIyL9GZZAzONcsq+89SwKqF/UM7hHbI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782312781; c=relaxed/simple; bh=fhVAs1PwPsfdnQ9Jjcy50CGNbeAplv8b8R0CwAfUEYE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mRRoEe38RH9YHvYGoUR2nHDTEBjGIb5LwYL0dpHz01+uIcEoYO3QFgp/xgKW6h5B9cbsjeEgTYbpOhXMf3TrOzei6G0lIU4JK7UANwgKNNVuWUTFUIRxelLiYSLd365qAbgEPTFi/ffdgDgg4KCJWb0xO+XWH6/58WoMDUIILRE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H2GcDsJ7; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H2GcDsJ7" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-490b64c8311so14383725e9.3 for ; Wed, 24 Jun 2026 07:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782312776; x=1782917576; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yBjOt8jVsqUKTnLTmqCowSfB7pi5Ax3g2yW+bcIaGZQ=; b=H2GcDsJ79+/ZQXI9moqCJsXxX7YCsqEvZhYyWWUZVI1nVaUpLKz1MT2/Lty4zRioGB l1YdxrzOtCv5P/wdUgNGkeWIEde1xXlz6c04mZMhNhVvKU5nUsFH/ZH/Rnlg+obiWXaK WOy3JRucKDwCFNxOfgAMA4so/apdhS9UD78lLu1sIjpAL9Gm8GJoc+uugJiiGafWgmoU D6zoqFg2qaNWuqKoZBWNrb7GmY/mxQtXjuwaQR68L433X1LkQbZsEw6KqOhLlIKp8HKa aWYXNgRpwMDKtwTHRhHSQb9MfEIaqD56KkrfPzK9Pp8FQUZPPW/64WCwsnfwcwy3WPfo YZTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782312776; x=1782917576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yBjOt8jVsqUKTnLTmqCowSfB7pi5Ax3g2yW+bcIaGZQ=; b=i5o2yhRhRcTi62BzhnX3T5pkMKA+mtExenPEi5oyW8qWmfaM6TKuU8rbAspV6lqpyA ZonEAS2EvnMrQIIllVohqE2tefn8HXa3Zyjm5habURA9ot9xN+4TI56IO4ff/z9SG50r xllimzJs/VBdW445JpZ3vVQ1TRP1ushiq7HoTzsmrw9hNkp1Wso8gdUphiQMwNtC6Z+L Lb/HHcHrg3rw2PHK6MDN6Yg7cC3RW0qCeSP9AzijNJRJpHUbFsCx89ShyfOKQBqQ+YLy hLwxg2MG4Na1mjB35y7y0/4i/yhLgaztbFHHpoTbLGvxhxO+h/t6vH5G7JGVq87bw/zK yGrA== X-Forwarded-Encrypted: i=1; AFNElJ8Mg+HORVM9wKHHkIuN6MPuzIp0YB3pUw12wdM+oEcoBXabZTltdTnLwc0OCyhRygRnIjlZqSScWt9Dj48=@vger.kernel.org X-Gm-Message-State: AOJu0YwIPmbXIXfGoWiBRu+ZW0wR0szOL33nZtASWsMlMnuURsjvllFh c6hBQ1Yef786rtFkPpnFYiwUpzkk2yuAfAch9D6lAzwNCaOgjRY3Ap16 X-Gm-Gg: AfdE7cka+dJy7YzNfPafginogCDsCzCj9CmSdiWIVX2axFUaLIxmU+Keq6Nk2DalSUv 11XKuJW3vmBYmjobg6IT4FglVqkCo82bhyzSPsZ/L7IItj7E5q61ETLiLCyG1Yxqc1YzBco/M/k vvdCuU10YZyBT59iiE0/vyiCNRzJNz2xqAcBXfI3Myo6hH4hI74+DTv+dw8eOdaon9X70TcMA0Q xIvVdhnF85jBd2lFz0Aq8V4Y2Ml7Jdnb9hDhLb+UQ2R7bJgYeXaPC8X0a1Feo6rp23CCQFuVR4O VtFRzAgSeR7dxAOy154LB/Tksd3NaEIAHc5KWV8xH+KVUBMi7+8z4UMp9TNi2J25r58YT9vXO08 uMtDpqnQUPWWwjirvMtRpnZHcc+KTEE/rlWErn+Wlx1aLUa6RAy7MjYd0ZFJPszIxGIGd3jfjec A1TZJV09GKQ2PKu+/NlEQYvf0dtwxLPnmfMa9D66JiHGGRU7dyXv1b/9ecfSMvwDJsLhyA0wZIa MKu0QFd X-Received: by 2002:a05:600d:4448:20b0:492:2f59:4969 with SMTP id 5b1f17b1804b1-4926086c381mr45682085e9.22.1782312776193; Wed, 24 Jun 2026 07:52:56 -0700 (PDT) Received: from snowdrop.snailnet.com (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4924923392dsm735988005e9.2.2026.06.24.07.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2026 07:52:55 -0700 (PDT) From: David Laight To: Mikulas Patocka , Tony Asleson , "Bryn M . Reeves" , Alasdair Kergon , Mike Snitzer , Benjamin Marzinski , dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org Cc: David Laight Subject: [PATCH 3/3] dm: lookup_ioctl(): Use designated array initialers Date: Wed, 24 Jun 2026 15:52:43 +0100 Message-Id: <20260624145243.2736-4-david.laight.linux@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260624145243.2736-1-david.laight.linux@gmail.com> References: <20260624145243.2736-1-david.laight.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use designated initialisers for the _ioctls[] array and delete the unused field that contained the array index. Makes the code more robust against the order of the initialers. Any uninitialised entries would be processed corretly. Signed-off-by: David Laight --- drivers/md/dm-ioctl.c | 47 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 57cfbc12c0ce..2ba1eda1c9dd 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1851,33 +1851,32 @@ static int target_message(struct file *filp, struct dm_ioctl *param, size_t para static ioctl_fn lookup_ioctl(unsigned int cmd, int *ioctl_flags) { static const struct { - int cmd; int flags; ioctl_fn fn; } _ioctls[] = { - {DM_VERSION_CMD, 0, NULL}, /* version is dealt with elsewhere */ - {DM_REMOVE_ALL_CMD, IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, remove_all}, - {DM_LIST_DEVICES_CMD, 0, list_devices}, - - {DM_DEV_CREATE_CMD, IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_create}, - {DM_DEV_REMOVE_CMD, IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_remove}, - {DM_DEV_RENAME_CMD, IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_rename}, - {DM_DEV_SUSPEND_CMD, IOCTL_FLAGS_NO_PARAMS, dev_suspend}, - {DM_DEV_STATUS_CMD, IOCTL_FLAGS_NO_PARAMS, dev_status}, - {DM_DEV_WAIT_CMD, 0, dev_wait}, - - {DM_TABLE_LOAD_CMD, 0, table_load}, - {DM_TABLE_CLEAR_CMD, IOCTL_FLAGS_NO_PARAMS, table_clear}, - {DM_TABLE_DEPS_CMD, 0, table_deps}, - {DM_TABLE_STATUS_CMD, 0, table_status}, - - {DM_LIST_VERSIONS_CMD, 0, list_versions}, - - {DM_TARGET_MSG_CMD, 0, target_message}, - {DM_DEV_SET_GEOMETRY_CMD, 0, dev_set_geometry}, - {DM_DEV_ARM_POLL_CMD, IOCTL_FLAGS_NO_PARAMS, dev_arm_poll}, - {DM_GET_TARGET_VERSION_CMD, 0, get_target_version}, - {DM_MPATH_PROBE_PATHS_CMD, 0, NULL}, /* block device ioctl */ + [DM_VERSION_CMD] = {0, NULL}, /* version is dealt with elsewhere */ + [DM_REMOVE_ALL_CMD] = {IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, remove_all}, + [DM_LIST_DEVICES_CMD] = {0, list_devices}, + + [DM_DEV_CREATE_CMD] = {IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_create}, + [DM_DEV_REMOVE_CMD] = {IOCTL_FLAGS_NO_PARAMS | IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_remove}, + [DM_DEV_RENAME_CMD] = {IOCTL_FLAGS_ISSUE_GLOBAL_EVENT, dev_rename}, + [DM_DEV_SUSPEND_CMD] = {IOCTL_FLAGS_NO_PARAMS, dev_suspend}, + [DM_DEV_STATUS_CMD] = {IOCTL_FLAGS_NO_PARAMS, dev_status}, + [DM_DEV_WAIT_CMD] = {0, dev_wait}, + + [DM_TABLE_LOAD_CMD] = {0, table_load}, + [DM_TABLE_CLEAR_CMD] = {IOCTL_FLAGS_NO_PARAMS, table_clear}, + [DM_TABLE_DEPS_CMD] = {0, table_deps}, + [DM_TABLE_STATUS_CMD] = {0, table_status}, + + [DM_LIST_VERSIONS_CMD] = {0, list_versions}, + + [DM_TARGET_MSG_CMD] = {0, target_message}, + [DM_DEV_SET_GEOMETRY_CMD] = {0, dev_set_geometry}, + [DM_DEV_ARM_POLL_CMD] = {IOCTL_FLAGS_NO_PARAMS, dev_arm_poll}, + [DM_GET_TARGET_VERSION_CMD] = {0, get_target_version}, + [DM_MPATH_PROBE_PATHS_CMD] = {0, NULL}, /* block device ioctl */ }; if (unlikely(cmd >= ARRAY_SIZE(_ioctls))) -- 2.39.5