summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/devfs.c10
-rw-r--r--fs/efi.c2
-rw-r--r--fs/efivarfs.c2
-rw-r--r--fs/fs.c89
-rw-r--r--fs/ramfs.c2
5 files changed, 34 insertions, 71 deletions
diff --git a/fs/devfs.c b/fs/devfs.c
index a7400df1c5..d088c1a66c 100644
--- a/fs/devfs.c
+++ b/fs/devfs.c
@@ -78,13 +78,10 @@ static int devfs_erase(struct device_d *_dev, FILE *f, loff_t count, loff_t offs
if (cdev->flags & DEVFS_PARTITION_READONLY)
return -EPERM;
- if (!cdev->ops->erase)
- return -ENOSYS;
-
if (count + offset > cdev->size)
count = cdev->size - offset;
- return cdev->ops->erase(cdev, count, offset + cdev->offset);
+ return cdev_erase(cdev, count, offset);
}
static int devfs_protect(struct device_d *_dev, FILE *f, size_t count, loff_t offset, int prot)
@@ -155,10 +152,7 @@ static int devfs_flush(struct device_d *_dev, FILE *f)
{
struct cdev *cdev = f->priv;
- if (cdev->ops->flush)
- return cdev->ops->flush(cdev);
-
- return 0;
+ return cdev_flush(cdev);
}
static int devfs_ioctl(struct device_d *_dev, FILE *f, int request, void *buf)
diff --git a/fs/efi.c b/fs/efi.c
index 81c1ffe078..944d6aac7a 100644
--- a/fs/efi.c
+++ b/fs/efi.c
@@ -513,7 +513,7 @@ coredevice_initcall(efifs_init);
static int index;
-int efi_fs_probe(struct efi_device *efidev)
+static int efi_fs_probe(struct efi_device *efidev)
{
char *path, *device;
int ret;
diff --git a/fs/efivarfs.c b/fs/efivarfs.c
index a911eac3bf..1e80493621 100644
--- a/fs/efivarfs.c
+++ b/fs/efivarfs.c
@@ -67,7 +67,7 @@ static int read_byte_str(const char *str, u8 *out)
return 0;
}
-int efi_guid_parse(const char *str, efi_guid_t *guid)
+static int efi_guid_parse(const char *str, efi_guid_t *guid)
{
int i, ret;
u8 idx[] = { 3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11, 12, 13, 14, 15 };
diff --git a/fs/fs.c b/fs/fs.c
index 1f6b3d3462..c6cb49996e 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -171,14 +171,14 @@ static void put_file(FILE *f)
dput(f->dentry);
}
-static int check_fd(int fd)
+static FILE *fd_to_file(int fd)
{
if (fd < 0 || fd >= MAX_FILES || !files[fd].in_use) {
errno = EBADF;
- return -errno;
+ return ERR_PTR(-errno);
}
- return 0;
+ return &files[fd];
}
static int create(struct dentry *dir, struct dentry *dentry)
@@ -205,14 +205,12 @@ EXPORT_SYMBOL(creat);
int ftruncate(int fd, loff_t length)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
if (f->size == FILE_SIZE_STREAM)
return 0;
@@ -232,14 +230,12 @@ int ftruncate(int fd, loff_t length)
int ioctl(int fd, int request, void *buf)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
fsdrv = f->fsdev->driver;
if (fsdrv->ioctl)
@@ -279,14 +275,12 @@ out:
ssize_t pread(int fd, void *buf, size_t count, loff_t offset)
{
loff_t pos;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
pos = f->pos;
f->pos = offset;
ret = __read(f, buf, count);
@@ -298,14 +292,12 @@ EXPORT_SYMBOL(pread);
ssize_t read(int fd, void *buf, size_t count)
{
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
ret = __read(f, buf, count);
if (ret > 0)
@@ -348,14 +340,12 @@ out:
ssize_t pwrite(int fd, const void *buf, size_t count, loff_t offset)
{
loff_t pos;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
pos = f->pos;
f->pos = offset;
ret = __write(f, buf, count);
@@ -367,14 +357,12 @@ EXPORT_SYMBOL(pwrite);
ssize_t write(int fd, const void *buf, size_t count)
{
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
ret = __write(f, buf, count);
if (ret > 0)
@@ -386,14 +374,12 @@ EXPORT_SYMBOL(write);
int flush(int fd)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
fsdrv = f->fsdev->driver;
if (fsdrv->flush)
ret = fsdrv->flush(&f->fsdev->dev, f);
@@ -406,17 +392,16 @@ int flush(int fd)
return ret;
}
-loff_t lseek(int fildes, loff_t offset, int whence)
+loff_t lseek(int fd, loff_t offset, int whence)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
loff_t pos;
int ret;
- if (check_fd(fildes))
+ if (IS_ERR(f))
return -1;
- f = &files[fildes];
fsdrv = f->fsdev->driver;
ret = -EINVAL;
@@ -461,12 +446,11 @@ EXPORT_SYMBOL(lseek);
int erase(int fd, loff_t count, loff_t offset)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
if (offset >= f->size)
return 0;
if (count == ERASE_SIZE_ALL || count > f->size - offset)
@@ -490,12 +474,11 @@ EXPORT_SYMBOL(erase);
int protect(int fd, size_t count, loff_t offset, int prot)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
if (offset >= f->size)
return 0;
if (count > f->size - offset)
@@ -532,15 +515,13 @@ int protect_file(const char *file, int prot)
void *memmap(int fd, int flags)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
void *retp = MAP_FAILED;
int ret;
- if (check_fd(fd))
+ if (IS_ERR(f))
return retp;
- f = &files[fd];
-
fsdrv = f->fsdev->driver;
if (fsdrv->memmap)
@@ -558,14 +539,12 @@ EXPORT_SYMBOL(memmap);
int close(int fd)
{
struct fs_driver_d *fsdrv;
- FILE *f;
+ FILE *f = fd_to_file(fd);
int ret = 0;
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
fsdrv = f->fsdev->driver;
if (fsdrv->close)
@@ -809,9 +788,6 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
struct readdir_entry *entry;
entry = xzalloc(sizeof(*entry));
- if (!entry)
- return -ENOMEM;
-
memcpy(entry->d.d_name, name, namlen);
list_add_tail(&entry->list, &rd->dir->entries);
@@ -850,16 +826,11 @@ static void stat_inode(struct inode *inode, struct stat *s)
int fstat(int fd, struct stat *s)
{
- FILE *f;
- struct fs_device_d *fsdev;
+ FILE *f = fd_to_file(fd);
- if (check_fd(fd))
+ if (IS_ERR(f))
return -errno;
- f = &files[fd];
-
- fsdev = f->fsdev;
-
stat_inode(f->f_inode, s);
return 0;
diff --git a/fs/ramfs.c b/fs/ramfs.c
index 4fba40d313..3046afef3b 100644
--- a/fs/ramfs.c
+++ b/fs/ramfs.c
@@ -403,8 +403,6 @@ static struct inode *ramfs_alloc_inode(struct super_block *sb)
struct ramfs_inode *node;
node = xzalloc(sizeof(*node));
- if (!node)
- return NULL;
return &node->inode;
}