From patchwork Mon Nov 4 01:45:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Valdis_Kl_=C4=93_tnieks?= X-Patchwork-Id: 11224865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 737291747 for ; Mon, 4 Nov 2019 01:46:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CA60222C7 for ; Mon, 4 Nov 2019 01:46:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728975AbfKDBqM (ORCPT ); Sun, 3 Nov 2019 20:46:12 -0500 Received: from outbound.smtp.vt.edu ([198.82.183.121]:39746 "EHLO omr1.cc.vt.edu" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728519AbfKDBqM (ORCPT ); Sun, 3 Nov 2019 20:46:12 -0500 Received: from mr1.cc.vt.edu (mail.ipv6.vt.edu [IPv6:2607:b400:92:9:0:9d:8fcb:4116]) by omr1.cc.vt.edu (8.14.4/8.14.4) with ESMTP id xA41kAR0025791 for ; Sun, 3 Nov 2019 20:46:10 -0500 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mr1.cc.vt.edu (8.14.7/8.14.7) with ESMTP id xA41k5Eu007308 for ; Sun, 3 Nov 2019 20:46:10 -0500 Received: by mail-qk1-f200.google.com with SMTP id 22so12141622qka.23 for ; Sun, 03 Nov 2019 17:46:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nCdjs/guPQ346vNtYDwvfg9pb4hZkLVUac954rX/dpk=; b=lqCkVJozbtqafjYqv2KoHS7MprkR/xhOLpsKFryVI45o4kx6DxmP4wxUlraKJyL1pR yRPFS4QPubLIoy09Cv2b2Ae0SdBoX8UpOJaM42x8tjxzpISvtKYGHa3HbvTBIXRhqbjT YSUYxDXrekfcDFnJLBNJjPNowOsxsVfduvRWFrBuMCNHanjpmNn72Z5DfW7tigjtFOKy Yx76uVtO3ticJ13MfzEZnd7ArobyD8rafBGjMkFNQaISRn8MDcKJ0EGphaCKLj6DvgxF A5xoikbCuZkHWgDpgvQ7HIyY29ZsdbbatLGO60ccyEOFsRneW1meia67HV3nRAKKoyiB aPFA== X-Gm-Message-State: APjAAAW1iwvHOOTJd4jav8A6ROE67JdGzAcKZ4kqCk/oj84ZkWIzB2eF drITlVw0LzT8tOPTLVK2xWNhoORQDB5rMQLD5xHxmJEoAOSapwdEfOeXEpA8qCJI8wnACBaIHfI B12vY+rhjR8WqmDsc7CXrCmJHA+SpVrkepWw5 X-Received: by 2002:a05:620a:120e:: with SMTP id u14mr7746813qkj.325.1572831965530; Sun, 03 Nov 2019 17:46:05 -0800 (PST) X-Google-Smtp-Source: APXvYqz2m7WN/D3Ffc/jabz7utsgrdaTFRm3V+LReg6jgNuifx+Z/76kOMw/7712smDxSyi/e4NGnQ== X-Received: by 2002:a05:620a:120e:: with SMTP id u14mr7746805qkj.325.1572831965261; Sun, 03 Nov 2019 17:46:05 -0800 (PST) Received: from turing-police.lan ([2601:5c0:c001:c9e1::359]) by smtp.gmail.com with ESMTPSA id d2sm8195354qkg.77.2019.11.03.17.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 17:46:04 -0800 (PST) From: Valdis Kletnieks X-Google-Original-From: Valdis Kletnieks To: Valdis Kletnieks Cc: Valdis Kletnieks , Greg Kroah-Hartman , linux-fsdevel@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/10] staging: exfat: Clean up return codes - FFS_INVALIDFID Date: Sun, 3 Nov 2019 20:45:00 -0500 Message-Id: <20191104014510.102356-5-Valdis.Kletnieks@vt.edu> X-Mailer: git-send-email 2.24.0.rc1 In-Reply-To: <20191104014510.102356-1-Valdis.Kletnieks@vt.edu> References: <20191104014510.102356-1-Valdis.Kletnieks@vt.edu> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Covert FFS_INVALIDFID to -EINVAL Signed-off-by: Valdis Kletnieks --- drivers/staging/exfat/exfat.h | 1 - drivers/staging/exfat/exfat_super.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h index 292af85e3cd2..7a817405c624 100644 --- a/drivers/staging/exfat/exfat.h +++ b/drivers/staging/exfat/exfat.h @@ -214,7 +214,6 @@ static inline u16 get_row_index(u16 i) #define FFS_NOTMOUNTED 4 #define FFS_ALIGNMENTERR 5 #define FFS_SEMAPHOREERR 6 -#define FFS_INVALIDFID 8 #define FFS_NOTOPENED 12 #define FFS_MAXOPENED 13 #define FFS_ERROR 19 diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c index 7c99d1f8cba8..dd6530aef63a 100644 --- a/drivers/staging/exfat/exfat_super.c +++ b/drivers/staging/exfat/exfat_super.c @@ -699,7 +699,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer, /* check the validity of the given file id */ if (!fid) - return FFS_INVALIDFID; + return -EINVAL; /* check the validity of pointer parameters */ if (!buffer) @@ -831,7 +831,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid, /* check the validity of the given file id */ if (!fid) - return FFS_INVALIDFID; + return -EINVAL; /* check the validity of pointer parameters */ if (!buffer) @@ -1237,7 +1237,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid, /* check the validity of the given file id */ if (!fid) - return FFS_INVALIDFID; + return -EINVAL; /* check the validity of pointer parameters */ if (!new_path || (*new_path == '\0')) @@ -1358,7 +1358,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid) /* check the validity of the given file id */ if (!fid) - return FFS_INVALIDFID; + return -EINVAL; /* acquire the lock for file system critical section */ mutex_lock(&p_fs->v_mutex); @@ -2145,7 +2145,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid) /* check the validity of the given file id */ if (!fid) - return FFS_INVALIDFID; + return -EINVAL; dir.dir = fid->dir.dir; dir.size = fid->dir.size;