From patchwork Tue Nov 1 23:05:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= X-Patchwork-Id: 13953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3261994wru; Tue, 1 Nov 2022 16:07:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Vz/fJUebSO6W6PP0REZKPkNZ+i/jbXMiN1wVWVLdLWI1kIwz7WvmAJaFmrL+Vnau4mB2L X-Received: by 2002:aa7:ce09:0:b0:461:5406:20e4 with SMTP id d9-20020aa7ce09000000b00461540620e4mr21791361edv.5.1667344039251; Tue, 01 Nov 2022 16:07:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667344039; cv=none; d=google.com; s=arc-20160816; b=VPaCvd8xgawuzb+nZWh2DB85elVB43yLNfKiHrIOb6JO/psEiBBpRI+etUXfsvBVSg K+PgPysLkW4GpDHDWC/4icWgRH1DdtuqCjemizZV2ToLX1bHJiFeTRvjpvLmvLP5eGpe 7nzUMUQF94U1x8pyQ/lfWa4qoAR2bBQbE2sRmfhp7MkxP083FFBukpIxaObd10fmM/9A xNDtjh/Doy+GyZRGCBZQpKtPLnNL5z0AVWKQ6T1nWLeZknXcYyhFPszjK60Mgk+f7P3x ilN/1tatASZ5Edelvy0bdfXGGoQ9YsNYdycoAD63hincMJPX3xaFmJe2EvcPZNv5kHGN ZcaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:from:date :dkim-signature; bh=00gsAulilkCCCrCyeYuHtbm4aj0uvOZOePyNFAywqJc=; b=IHEDXL9xKUhHpCsBXd2tmSUffszJgWGMUEUBLfuBypIbtlLr8xoCS22IF10lMbj0DI dZx7A+/taf5en6W3dPVEW6EmfJevrywUmwNVX8qi0EuPkJZUrqU/JHEybQ0jQCq6m8qy KaoAHdueyma5J6aeOfRip374B39Hmn4T7dP/CXbcssnN/giXgh0MMNOrWEH+h+6EHTzL gSRSik6mHiYwyl0T0ZdgZxgRFvEbTvpGakvI2azsqpmH5pSmNcTMqJPX21BiOgtla5T4 vLGk8qqJHnHfIxTn0XG+o5/gw22v9uRhOeYhtkO2+6Qo0Jg9YWWT6OfXspSFjJyMCY5c m9lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202205 header.b="DOZ/iY9V"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d6-20020a056402400600b0046125ddf5easi12327892eda.185.2022.11.01.16.06.32; Tue, 01 Nov 2022 16:07:19 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202205 header.b="DOZ/iY9V"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nabijaczleweli.xyz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230437AbiKAXFo (ORCPT + 99 others); Tue, 1 Nov 2022 19:05:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231314AbiKAXF0 (ORCPT ); Tue, 1 Nov 2022 19:05:26 -0400 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D014060FB; Tue, 1 Nov 2022 16:05:23 -0700 (PDT) Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 058F84EE4; Wed, 2 Nov 2022 00:05:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202205; t=1667343923; bh=5guxHxeMZO6jIhjwoXxtFNICxaf3NerLu1RM6JzApG4=; h=Date:From:Cc:Subject:References:In-Reply-To:From; b=DOZ/iY9VEwQrhOuresZhwUToPAjrGxbNLWtvATGCJF/4go+9j/vqg7qzRFZUwgxL0 oIyqPGCrnf7bTW/g6D00WKuA9nrlq6qe6Og1tWtZveGnphXUU6eqBZt8zLRU87czrB uYY39qwZdFHmrbm6BdWtd4ohAmGB72vJCXecnyEHnlvh7ZAtGUZHI6KfiwMu1VE3sI D7cQmliNCrOj/cg7/6xCoY9e0KOiwcJGyIqkh6wzmH611pN0nTSsyPq62rW2O6uCAS CoKSmGvLxb+OHZA46BbFiiopFl0fxLjOHTjc+BKwRdOfuMIL+hDO25MB71f1OSuruL J84ebKfovFSpHjj87gYE/ggggv4OnXO93FU7kYjUD1f+BpskCcoqowDdClF8TD3bUN F7Lus6J1DqIfdyHZdJt5CiLzD/Hjex3fWt5HHaVd7Cr3PtnefUbC/Vr2MFzOetJrjy 6t2IJ6zjK8wAnVwHCrVP+SLlF6x5CNLSADto4wvKi152wcg/9KxO3Qy9kSkQjBjZ0O rbp7qXzntnmtVxhRDZFp5qQIcK61+G2DwZVTxrMvSH0Qi2s/0v0WSJia8oc/qGc9ud VdiWibn8aQjkq16g3CsZy0QQ/hk2aiyCx6DU6Lzv+qiJIEsaiN0CSrX/lfUGjeB5Kd py8AaTSFkrnZi53mymxcbUuY= Date: Wed, 2 Nov 2022 00:05:21 +0100 From: Ahelenia =?utf-8?q?Ziemia=C5=84ska?= Cc: Jonathan Corbet , Federico Vaga , Alex Shi , Yanteng Si , Hu Haowen , Jan Harkes , coda@cs.cmu.edu, Greg Kroah-Hartman , Jiri Slaby , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc-tw-discuss@lists.sourceforge.net, codalist@coda.cs.cmu.edu Subject: [PATCH v2 05/15] coda: remove CODA_MAGIC Message-ID: <9b1b965d7301e67654d726db42876232333a459a.1667330271.git.nabijaczleweli@nabijaczleweli.xyz> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20220429 X-Spam-Status: No, score=2.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FROM_SUSPICIOUS_NTLD, MISSING_HEADERS,PDS_OTHER_BAD_TLD,PDS_RDNS_DYNAMIC_FP,RDNS_DYNAMIC, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748336943237213987?= X-GMAIL-MSGID: =?utf-8?q?1748336943237213987?= We have largely moved away from this approach, and we have better debugging tooling nowadays: kill it. Link: https://lore.kernel.org/linux-doc/YyMlovoskUcHLEb7@kroah.com/ Signed-off-by: Ahelenia ZiemiaƄska --- Documentation/process/magic-number.rst | 1 - Documentation/translations/it_IT/process/magic-number.rst | 1 - Documentation/translations/zh_CN/process/magic-number.rst | 1 - Documentation/translations/zh_TW/process/magic-number.rst | 1 - fs/coda/cnode.c | 2 +- fs/coda/coda_fs_i.h | 2 -- fs/coda/file.c | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Documentation/process/magic-number.rst b/Documentation/process/magic-number.rst index 18f8b1e3a993..335169e43be1 100644 --- a/Documentation/process/magic-number.rst +++ b/Documentation/process/magic-number.rst @@ -74,7 +74,6 @@ FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/ SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h`` KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h`` -CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c`` QUEUE_MAGIC_USED 0xf7e1cc33 queue_entry ``drivers/scsi/arm/queue.c`` diff --git a/Documentation/translations/it_IT/process/magic-number.rst b/Documentation/translations/it_IT/process/magic-number.rst index 827167b18f15..699b681088ac 100644 --- a/Documentation/translations/it_IT/process/magic-number.rst +++ b/Documentation/translations/it_IT/process/magic-number.rst @@ -80,7 +80,6 @@ FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/ SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h`` KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h`` -CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c`` QUEUE_MAGIC_USED 0xf7e1cc33 queue_entry ``drivers/scsi/arm/queue.c`` diff --git a/Documentation/translations/zh_CN/process/magic-number.rst b/Documentation/translations/zh_CN/process/magic-number.rst index 9553475e9867..d1ede86944f1 100644 --- a/Documentation/translations/zh_CN/process/magic-number.rst +++ b/Documentation/translations/zh_CN/process/magic-number.rst @@ -63,7 +63,6 @@ FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/ SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h`` KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h`` -CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c`` QUEUE_MAGIC_USED 0xf7e1cc33 queue_entry ``drivers/scsi/arm/queue.c`` diff --git a/Documentation/translations/zh_TW/process/magic-number.rst b/Documentation/translations/zh_TW/process/magic-number.rst index 8a64f56ae267..1dd01f1e1c17 100644 --- a/Documentation/translations/zh_TW/process/magic-number.rst +++ b/Documentation/translations/zh_TW/process/magic-number.rst @@ -66,7 +66,6 @@ FASYNC_MAGIC 0x4601 fasync_struct ``include/linux/ SLIP_MAGIC 0x5302 slip ``drivers/net/slip.h`` HDLCDRV_MAGIC 0x5ac6e778 hdlcdrv_state ``include/linux/hdlcdrv.h`` KV_MAGIC 0x5f4b565f kernel_vars_s ``arch/mips/include/asm/sn/klkernvars.h`` -CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c`` QUEUE_MAGIC_USED 0xf7e1cc33 queue_entry ``drivers/scsi/arm/queue.c`` diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c index 62a3d2565c26..e217cca338bd 100644 --- a/fs/coda/cnode.c +++ b/fs/coda/cnode.c @@ -157,7 +157,7 @@ struct coda_file_info *coda_ftoc(struct file *file) { struct coda_file_info *cfi = file->private_data; - BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC); + BUG_ON(!cfi); return cfi; diff --git a/fs/coda/coda_fs_i.h b/fs/coda/coda_fs_i.h index 1763ff95d865..9e4b54dbe7d7 100644 --- a/fs/coda/coda_fs_i.h +++ b/fs/coda/coda_fs_i.h @@ -35,9 +35,7 @@ struct coda_inode_info { /* * coda fs file private data */ -#define CODA_MAGIC 0xC0DAC0DA struct coda_file_info { - int cfi_magic; /* magic number */ struct file *cfi_container; /* container file for this cnode */ unsigned int cfi_mapcount; /* nr of times this file is mapped */ bool cfi_access_intent; /* is access intent supported */ diff --git a/fs/coda/file.c b/fs/coda/file.c index 3f3c81e6b1ab..c23f846bf206 100644 --- a/fs/coda/file.c +++ b/fs/coda/file.c @@ -222,7 +222,6 @@ int coda_open(struct inode *coda_inode, struct file *coda_file) host_file->f_flags |= coda_file->f_flags & (O_APPEND | O_SYNC); - cfi->cfi_magic = CODA_MAGIC; cfi->cfi_mapcount = 0; cfi->cfi_container = host_file; /* assume access intents are supported unless we hear otherwise */