From: Valdis Kletnieks <valdis.kletnieks@vt.edu>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>,
Valdis Kletnieks <valdis.kletnieks@vt.edu>,
linux-fsdevel@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 04/15] staging: exfat: Clean up return codes - FFS_PERMISSIONERR
Date: Thu, 24 Oct 2019 11:53:15 -0400 [thread overview]
Message-ID: <20191024155327.1095907-5-Valdis.Kletnieks@vt.edu> (raw)
In-Reply-To: <20191024155327.1095907-1-Valdis.Kletnieks@vt.edu>
Convert FFS_PERMISSIONERR to -EPERM
Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
---
drivers/staging/exfat/exfat.h | 1 -
drivers/staging/exfat/exfat_super.c | 20 ++++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
index ec52237b01cd..86bdcf222a5a 100644
--- a/drivers/staging/exfat/exfat.h
+++ b/drivers/staging/exfat/exfat.h
@@ -217,7 +217,6 @@ static inline u16 get_row_index(u16 i)
#define FFS_INVALIDPATH 7
#define FFS_INVALIDFID 8
#define FFS_FILEEXIST 10
-#define FFS_PERMISSIONERR 11
#define FFS_NOTOPENED 12
#define FFS_MAXOPENED 13
#define FFS_EOF 15
diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
index 566cfba0a522..fd5d8ba0d8bc 100644
--- a/drivers/staging/exfat/exfat_super.c
+++ b/drivers/staging/exfat/exfat_super.c
@@ -702,7 +702,7 @@ static int ffsReadFile(struct inode *inode, struct file_id_t *fid, void *buffer,
/* check if the given file ID is opened */
if (fid->type != TYPE_FILE) {
- ret = FFS_PERMISSIONERR;
+ ret = -EPERM;
goto out;
}
@@ -832,7 +832,7 @@ static int ffsWriteFile(struct inode *inode, struct file_id_t *fid,
/* check if the given file ID is opened */
if (fid->type != TYPE_FILE) {
- ret = FFS_PERMISSIONERR;
+ ret = -EPERM;
goto out;
}
@@ -1079,7 +1079,7 @@ static int ffsTruncateFile(struct inode *inode, u64 old_size, u64 new_size)
/* check if the given file ID is opened */
if (fid->type != TYPE_FILE) {
- ret = FFS_PERMISSIONERR;
+ ret = -EPERM;
goto out;
}
@@ -1246,7 +1246,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
/* check if the old file is "." or ".." */
if (p_fs->vol_type != EXFAT) {
if ((olddir.dir != p_fs->root_dir) && (dentry < 2)) {
- ret = FFS_PERMISSIONERR;
+ ret = -EPERM;
goto out2;
}
}
@@ -1258,7 +1258,7 @@ static int ffsMoveFile(struct inode *old_parent_inode, struct file_id_t *fid,
}
if (p_fs->fs_func->get_entry_attr(ep) & ATTR_READONLY) {
- ret = FFS_PERMISSIONERR;
+ ret = -EPERM;
goto out2;
}
@@ -1365,7 +1365,7 @@ static int ffsRemoveFile(struct inode *inode, struct file_id_t *fid)
}
if (p_fs->fs_func->get_entry_attr(ep) & ATTR_READONLY) {
- ret = FFS_PERMISSIONERR;
+ ret = -EPERM;
goto out;
}
fs_set_vol_flags(sb, VOL_DIRTY);
@@ -1947,7 +1947,7 @@ static int ffsReadDir(struct inode *inode, struct dir_entry_t *dir_entry)
/* check if the given file ID is opened */
if (fid->type != TYPE_DIR)
- return FFS_PERMISSIONERR;
+ return -EPERM;
/* acquire the lock for file system critical section */
down(&p_fs->v_sem);
@@ -2145,7 +2145,7 @@ static int ffsRemoveDir(struct inode *inode, struct file_id_t *fid)
/* check if the file is "." or ".." */
if (p_fs->vol_type != EXFAT) {
if ((dir.dir != p_fs->root_dir) && (dentry < 2))
- return FFS_PERMISSIONERR;
+ return -EPERM;
}
/* acquire the lock for file system critical section */
@@ -2526,7 +2526,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
err = ffsRemoveFile(dir, &(EXFAT_I(inode)->fid));
if (err) {
- if (err == FFS_PERMISSIONERR)
+ if (err == -EPERM)
err = -EPERM;
else
err = -EIO;
@@ -2746,7 +2746,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
err = ffsMoveFile(old_dir, &(EXFAT_I(old_inode)->fid), new_dir,
new_dentry);
if (err) {
- if (err == FFS_PERMISSIONERR)
+ if (err == -EPERM)
err = -EPERM;
else if (err == FFS_INVALIDPATH)
err = -EINVAL;
--
2.23.0
next prev parent reply other threads:[~2019-10-24 15:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 15:53 [PATCH 00/15] staging: exfat: Clean up return codes Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 01/15] staging: exfat: Clean up return codes - FFS_FULL Valdis Kletnieks
2019-10-24 17:59 ` Matthew Wilcox
2019-10-24 18:39 ` Valdis Klētnieks
2019-10-24 15:53 ` [PATCH 02/15] staging: exfat: Clean up return codes - FFS_NOTFOUND Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 03/15] staging: exfat: Clean up return codes - FFS_DIRBUSY Valdis Kletnieks
2019-10-24 15:53 ` Valdis Kletnieks [this message]
2019-10-24 16:23 ` [PATCH 04/15] staging: exfat: Clean up return codes - FFS_PERMISSIONERR Joe Perches
2019-10-24 16:27 ` Valdis Klētnieks
2019-10-25 10:14 ` Dan Carpenter
2019-10-24 15:53 ` [PATCH 05/15] staging: exfat: Clean up return codes - FFS_NAMETOOLONG Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 06/15] staging: exfat: Clean up return codes - FFS_FILEEXIST Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 07/15] staging: exfat: Clean up return codes - FFS_INVALIDPATH Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 08/15] staging: exfat: Clean up return code - FFS_MEMORYERR Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 09/15] staging: exfat: Clean up return codes - FFS_FORMATERR Valdis Kletnieks
2019-10-25 2:56 ` Greg Kroah-Hartman
2019-10-24 15:53 ` [PATCH 10/15] staging: exfat: Clean up return codes - FFS_MEDIAERR Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 11/15] staging: exfat: Clean up return codes - FFS_EOF Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 12/15] staging: exfat: Clean up return codes - FFS_INVALIDFID Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 13/15] staging: exfat: Clean up return codes - FFS_ERROR Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 14/15] staging: exfat: Clean up return codes - remove unused codes Valdis Kletnieks
2019-10-24 15:53 ` [PATCH 15/15] staging: exfat: Clean up return codes - FFS_SUCCESS Valdis Kletnieks
2019-10-24 16:29 ` Joe Perches
2019-10-24 16:46 ` Valdis Klētnieks
2019-10-24 16:23 ` [PATCH 00/15] staging: exfat: Clean up return codes Joe Perches
2019-10-24 16:45 ` Valdis Klētnieks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191024155327.1095907-5-Valdis.Kletnieks@vt.edu \
--to=valdis.kletnieks@vt.edu \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).