OSDN Git Service

staging: exfat: Clean up return codes - FFS_NOTFOUND
authorValdis Kletnieks <valdis.kletnieks@vt.edu>
Thu, 24 Oct 2019 15:53:13 +0000 (11:53 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Oct 2019 02:47:08 +0000 (22:47 -0400)
Convert FFS_NOTFOUND to -ENOENT

Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Link: https://lore.kernel.org/r/20191024155327.1095907-3-Valdis.Kletnieks@vt.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/exfat/exfat.h
drivers/staging/exfat/exfat_super.c

index 548b7ad..26120df 100644 (file)
@@ -216,7 +216,6 @@ static inline u16 get_row_index(u16 i)
 #define FFS_SEMAPHOREERR        6
 #define FFS_INVALIDPATH         7
 #define FFS_INVALIDFID          8
-#define FFS_NOTFOUND            9
 #define FFS_FILEEXIST           10
 #define FFS_PERMISSIONERR       11
 #define FFS_NOTOPENED           12
index 90ae0f2..7b1ed81 100644 (file)
@@ -578,7 +578,7 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid)
        dentry = p_fs->fs_func->find_dir_entry(sb, &dir, &uni_name, num_entries,
                                               &dos_name, TYPE_ALL);
        if (dentry < -1) {
-               ret = FFS_NOTFOUND;
+               ret = -ENOENT;
                goto out;
        }
 
@@ -2701,7 +2701,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
                        err = -EINVAL;
                else if (err == FFS_FILEEXIST)
                        err = -ENOTEMPTY;
-               else if (err == FFS_NOTFOUND)
+               else if (err == -ENOENT)
                        err = -ENOENT;
                else if (err == FFS_DIRBUSY)
                        err = -EBUSY;
@@ -2758,7 +2758,7 @@ static int exfat_rename(struct inode *old_dir, struct dentry *old_dentry,
                        err = -EINVAL;
                else if (err == FFS_FILEEXIST)
                        err = -EEXIST;
-               else if (err == FFS_NOTFOUND)
+               else if (err == -ENOENT)
                        err = -ENOENT;
                else if (err == -ENOSPC)
                        err = -ENOSPC;