fs: rename inode member of struct filep to priv
Because that's what it is. 'inode' will become confusing once we support real inodes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
09c4b63aa2
commit
6977292a34
|
@ -161,7 +161,7 @@ static int bpkfs_open(struct device_d *dev, FILE *f, const char *filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
f->size = d->size;
|
f->size = d->size;
|
||||||
f->inode = d;
|
f->priv = d;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
@ -172,7 +172,7 @@ out:
|
||||||
|
|
||||||
static int bpkfs_close(struct device_d *dev, FILE *file)
|
static int bpkfs_close(struct device_d *dev, FILE *file)
|
||||||
{
|
{
|
||||||
struct bpkfs_handle_data *d = file->inode;
|
struct bpkfs_handle_data *d = file->priv;
|
||||||
|
|
||||||
close(d->fd);
|
close(d->fd);
|
||||||
|
|
||||||
|
@ -181,7 +181,7 @@ static int bpkfs_close(struct device_d *dev, FILE *file)
|
||||||
|
|
||||||
static int bpkfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
static int bpkfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct bpkfs_handle_data *d = file->inode;
|
struct bpkfs_handle_data *d = file->priv;
|
||||||
|
|
||||||
if (bpkfs_is_crc_file(d)) {
|
if (bpkfs_is_crc_file(d)) {
|
||||||
memcpy(buf, &d->data[d->pos], insize);
|
memcpy(buf, &d->data[d->pos], insize);
|
||||||
|
@ -193,7 +193,7 @@ static int bpkfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize
|
||||||
|
|
||||||
static loff_t bpkfs_lseek(struct device_d *dev, FILE *file, loff_t pos)
|
static loff_t bpkfs_lseek(struct device_d *dev, FILE *file, loff_t pos)
|
||||||
{
|
{
|
||||||
struct bpkfs_handle_data *d = file->inode;
|
struct bpkfs_handle_data *d = file->priv;
|
||||||
|
|
||||||
if (!bpkfs_is_crc_file(d))
|
if (!bpkfs_is_crc_file(d))
|
||||||
lseek(d->fd, d->offset + pos, SEEK_SET);
|
lseek(d->fd, d->offset + pos, SEEK_SET);
|
||||||
|
|
|
@ -290,7 +290,7 @@ static int cramfs_open(struct device_d *_dev, FILE *file, const char *filename)
|
||||||
if (!inodei)
|
if (!inodei)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
file->inode = inodei;
|
file->priv = inodei;
|
||||||
file->size = inodei->inode.size;
|
file->size = inodei->inode.size;
|
||||||
|
|
||||||
inodei->block_ptrs = xzalloc(4096);
|
inodei->block_ptrs = xzalloc(4096);
|
||||||
|
@ -301,7 +301,7 @@ static int cramfs_open(struct device_d *_dev, FILE *file, const char *filename)
|
||||||
|
|
||||||
static int cramfs_close(struct device_d *dev, FILE *file)
|
static int cramfs_close(struct device_d *dev, FILE *file)
|
||||||
{
|
{
|
||||||
struct cramfs_inode_info *inodei = file->inode;
|
struct cramfs_inode_info *inodei = file->priv;
|
||||||
|
|
||||||
free(inodei->block_ptrs);
|
free(inodei->block_ptrs);
|
||||||
free(inodei);
|
free(inodei);
|
||||||
|
@ -312,7 +312,7 @@ static int cramfs_close(struct device_d *dev, FILE *file)
|
||||||
static int cramfs_read(struct device_d *_dev, FILE *f, void *buf, size_t size)
|
static int cramfs_read(struct device_d *_dev, FILE *f, void *buf, size_t size)
|
||||||
{
|
{
|
||||||
struct cramfs_priv *priv = _dev->priv;
|
struct cramfs_priv *priv = _dev->priv;
|
||||||
struct cramfs_inode_info *inodei = f->inode;
|
struct cramfs_inode_info *inodei = f->priv;
|
||||||
struct cramfs_inode *inode = &inodei->inode;
|
struct cramfs_inode *inode = &inodei->inode;
|
||||||
unsigned int blocknr;
|
unsigned int blocknr;
|
||||||
int outsize = 0;
|
int outsize = 0;
|
||||||
|
|
20
fs/devfs.c
20
fs/devfs.c
|
@ -37,14 +37,14 @@ extern struct list_head cdev_list;
|
||||||
|
|
||||||
static int devfs_read(struct device_d *_dev, FILE *f, void *buf, size_t size)
|
static int devfs_read(struct device_d *_dev, FILE *f, void *buf, size_t size)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
|
|
||||||
return cdev_read(cdev, buf, size, f->pos, f->flags);
|
return cdev_read(cdev, buf, size, f->pos, f->flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int devfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t size)
|
static int devfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t size)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
|
|
||||||
if (cdev->flags & DEVFS_PARTITION_READONLY)
|
if (cdev->flags & DEVFS_PARTITION_READONLY)
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
@ -54,7 +54,7 @@ static int devfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t s
|
||||||
|
|
||||||
static loff_t devfs_lseek(struct device_d *_dev, FILE *f, loff_t pos)
|
static loff_t devfs_lseek(struct device_d *_dev, FILE *f, loff_t pos)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
loff_t ret = -1;
|
loff_t ret = -1;
|
||||||
|
|
||||||
if (cdev->ops->lseek)
|
if (cdev->ops->lseek)
|
||||||
|
@ -68,7 +68,7 @@ static loff_t devfs_lseek(struct device_d *_dev, FILE *f, loff_t pos)
|
||||||
|
|
||||||
static int devfs_erase(struct device_d *_dev, FILE *f, size_t count, loff_t offset)
|
static int devfs_erase(struct device_d *_dev, FILE *f, size_t count, loff_t offset)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
|
|
||||||
if (cdev->flags & DEVFS_PARTITION_READONLY)
|
if (cdev->flags & DEVFS_PARTITION_READONLY)
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
@ -84,7 +84,7 @@ static int devfs_erase(struct device_d *_dev, FILE *f, size_t count, loff_t offs
|
||||||
|
|
||||||
static int devfs_protect(struct device_d *_dev, FILE *f, size_t count, loff_t offset, int prot)
|
static int devfs_protect(struct device_d *_dev, FILE *f, size_t count, loff_t offset, int prot)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
|
|
||||||
if (!cdev->ops->protect)
|
if (!cdev->ops->protect)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
@ -94,7 +94,7 @@ static int devfs_protect(struct device_d *_dev, FILE *f, size_t count, loff_t of
|
||||||
|
|
||||||
static int devfs_memmap(struct device_d *_dev, FILE *f, void **map, int flags)
|
static int devfs_memmap(struct device_d *_dev, FILE *f, void **map, int flags)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
int ret = -ENOSYS;
|
int ret = -ENOSYS;
|
||||||
|
|
||||||
if (!cdev->ops->memmap)
|
if (!cdev->ops->memmap)
|
||||||
|
@ -120,7 +120,7 @@ static int devfs_open(struct device_d *_dev, FILE *f, const char *filename)
|
||||||
|
|
||||||
f->size = cdev->flags & DEVFS_IS_CHARACTER_DEV ?
|
f->size = cdev->flags & DEVFS_IS_CHARACTER_DEV ?
|
||||||
FILE_SIZE_STREAM : cdev->size;
|
FILE_SIZE_STREAM : cdev->size;
|
||||||
f->inode = cdev;
|
f->priv = cdev;
|
||||||
|
|
||||||
if (cdev->ops->open) {
|
if (cdev->ops->open) {
|
||||||
ret = cdev->ops->open(cdev, f->flags);
|
ret = cdev->ops->open(cdev, f->flags);
|
||||||
|
@ -135,7 +135,7 @@ static int devfs_open(struct device_d *_dev, FILE *f, const char *filename)
|
||||||
|
|
||||||
static int devfs_close(struct device_d *_dev, FILE *f)
|
static int devfs_close(struct device_d *_dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (cdev->ops->close) {
|
if (cdev->ops->close) {
|
||||||
|
@ -151,7 +151,7 @@ static int devfs_close(struct device_d *_dev, FILE *f)
|
||||||
|
|
||||||
static int devfs_flush(struct device_d *_dev, FILE *f)
|
static int devfs_flush(struct device_d *_dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
|
|
||||||
if (cdev->ops->flush)
|
if (cdev->ops->flush)
|
||||||
return cdev->ops->flush(cdev);
|
return cdev->ops->flush(cdev);
|
||||||
|
@ -161,7 +161,7 @@ static int devfs_flush(struct device_d *_dev, FILE *f)
|
||||||
|
|
||||||
static int devfs_ioctl(struct device_d *_dev, FILE *f, int request, void *buf)
|
static int devfs_ioctl(struct device_d *_dev, FILE *f, int request, void *buf)
|
||||||
{
|
{
|
||||||
struct cdev *cdev = f->inode;
|
struct cdev *cdev = f->priv;
|
||||||
|
|
||||||
return cdev_ioctl(cdev, request, buf);
|
return cdev_ioctl(cdev, request, buf);
|
||||||
}
|
}
|
||||||
|
|
12
fs/efi.c
12
fs/efi.c
|
@ -243,7 +243,7 @@ static int efifs_open(struct device_d *dev, FILE *f, const char *filename)
|
||||||
f->size = info->FileSize;
|
f->size = info->FileSize;
|
||||||
|
|
||||||
free(info);
|
free(info);
|
||||||
f->inode = ufile;
|
f->priv = ufile;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
out:
|
out:
|
||||||
|
@ -254,7 +254,7 @@ out:
|
||||||
|
|
||||||
static int efifs_close(struct device_d *dev, FILE *f)
|
static int efifs_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct efifs_file *ufile = f->inode;
|
struct efifs_file *ufile = f->priv;
|
||||||
|
|
||||||
ufile->entry->close(ufile->entry);
|
ufile->entry->close(ufile->entry);
|
||||||
|
|
||||||
|
@ -265,7 +265,7 @@ static int efifs_close(struct device_d *dev, FILE *f)
|
||||||
|
|
||||||
static int efifs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
static int efifs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct efifs_file *ufile = f->inode;
|
struct efifs_file *ufile = f->priv;
|
||||||
efi_status_t efiret;
|
efi_status_t efiret;
|
||||||
unsigned long bufsize = insize;
|
unsigned long bufsize = insize;
|
||||||
|
|
||||||
|
@ -279,7 +279,7 @@ static int efifs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
|
|
||||||
static int efifs_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
static int efifs_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct efifs_file *ufile = f->inode;
|
struct efifs_file *ufile = f->priv;
|
||||||
efi_status_t efiret;
|
efi_status_t efiret;
|
||||||
unsigned long bufsize = insize;
|
unsigned long bufsize = insize;
|
||||||
|
|
||||||
|
@ -294,7 +294,7 @@ static int efifs_write(struct device_d *_dev, FILE *f, const void *buf, size_t i
|
||||||
|
|
||||||
static loff_t efifs_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
static loff_t efifs_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
||||||
{
|
{
|
||||||
struct efifs_file *ufile = f->inode;
|
struct efifs_file *ufile = f->priv;
|
||||||
efi_status_t efiret;
|
efi_status_t efiret;
|
||||||
|
|
||||||
f->pos = pos;
|
f->pos = pos;
|
||||||
|
@ -309,7 +309,7 @@ static loff_t efifs_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
||||||
|
|
||||||
static int efifs_truncate(struct device_d *dev, FILE *f, unsigned long size)
|
static int efifs_truncate(struct device_d *dev, FILE *f, unsigned long size)
|
||||||
{
|
{
|
||||||
struct efifs_file *ufile = f->inode;
|
struct efifs_file *ufile = f->priv;
|
||||||
efi_status_t efiret;
|
efi_status_t efiret;
|
||||||
struct efi_file_info *info;
|
struct efi_file_info *info;
|
||||||
unsigned long bufsize = 1024;
|
unsigned long bufsize = 1024;
|
||||||
|
|
|
@ -236,7 +236,7 @@ static int efivarfs_open(struct device_d *dev, FILE *f, const char *filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
f->size = efile->size;
|
f->size = efile->size;
|
||||||
f->inode = efile;
|
f->priv = efile;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -249,7 +249,7 @@ out:
|
||||||
|
|
||||||
static int efivarfs_close(struct device_d *dev, FILE *f)
|
static int efivarfs_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct efivars_file *efile = f->inode;
|
struct efivars_file *efile = f->priv;
|
||||||
|
|
||||||
free(efile->buf);
|
free(efile->buf);
|
||||||
free(efile);
|
free(efile);
|
||||||
|
@ -259,7 +259,7 @@ static int efivarfs_close(struct device_d *dev, FILE *f)
|
||||||
|
|
||||||
static int efivarfs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
static int efivarfs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct efivars_file *efile = f->inode;
|
struct efivars_file *efile = f->priv;
|
||||||
|
|
||||||
memcpy(buf, efile->buf + f->pos, insize);
|
memcpy(buf, efile->buf + f->pos, insize);
|
||||||
|
|
||||||
|
@ -268,7 +268,7 @@ static int efivarfs_read(struct device_d *_dev, FILE *f, void *buf, size_t insiz
|
||||||
|
|
||||||
static int efivarfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
static int efivarfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct efivars_file *efile = f->inode;
|
struct efivars_file *efile = f->priv;
|
||||||
|
|
||||||
if (efile->size < f->pos + insize) {
|
if (efile->size < f->pos + insize) {
|
||||||
efile->buf = realloc(efile->buf, f->pos + insize);
|
efile->buf = realloc(efile->buf, f->pos + insize);
|
||||||
|
@ -285,7 +285,7 @@ static int efivarfs_write(struct device_d *_dev, FILE *f, const void *buf, size_
|
||||||
|
|
||||||
static int efivarfs_truncate(struct device_d *dev, FILE *f, ulong size)
|
static int efivarfs_truncate(struct device_d *dev, FILE *f, ulong size)
|
||||||
{
|
{
|
||||||
struct efivars_file *efile = f->inode;
|
struct efivars_file *efile = f->priv;
|
||||||
|
|
||||||
efile->size = size;
|
efile->size = size;
|
||||||
efile->buf = realloc(efile->buf, efile->size + sizeof(uint32_t));
|
efile->buf = realloc(efile->buf, efile->size + sizeof(uint32_t));
|
||||||
|
|
|
@ -57,7 +57,7 @@ static int ext_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
file->size = __le32_to_cpu(inode->inode.size);
|
file->size = __le32_to_cpu(inode->inode.size);
|
||||||
file->inode = inode;
|
file->priv = inode;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -66,14 +66,14 @@ static int ext_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct ext_filesystem *fs = dev->priv;
|
struct ext_filesystem *fs = dev->priv;
|
||||||
|
|
||||||
ext4fs_free_node(f->inode, &fs->data->diropen);
|
ext4fs_free_node(f->priv, &fs->data->diropen);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ext_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
static int ext_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
return ext4fs_read_file(f->inode, f->pos, insize, buf);
|
return ext4fs_read_file(f->priv, f->pos, insize, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static loff_t ext_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
static loff_t ext_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
||||||
|
|
12
fs/fat/fat.c
12
fs/fat/fat.c
|
@ -161,7 +161,7 @@ static int fat_rmdir(struct device_d *dev, const char *pathname)
|
||||||
|
|
||||||
static int fat_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
static int fat_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
FIL *f_file = f->inode;
|
FIL *f_file = f->priv;
|
||||||
int outsize;
|
int outsize;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ static int fat_write(struct device_d *_dev, FILE *f, const void *buf, size_t ins
|
||||||
|
|
||||||
static int fat_truncate(struct device_d *dev, FILE *f, ulong size)
|
static int fat_truncate(struct device_d *dev, FILE *f, ulong size)
|
||||||
{
|
{
|
||||||
FIL *f_file = f->inode;
|
FIL *f_file = f->priv;
|
||||||
unsigned long lastofs;
|
unsigned long lastofs;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -232,7 +232,7 @@ static int fat_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
ret = f_lseek(f_file, f_file->fsize);
|
ret = f_lseek(f_file, f_file->fsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
file->inode = f_file;
|
file->priv = f_file;
|
||||||
file->size = f_file->fsize;
|
file->size = f_file->fsize;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -241,7 +241,7 @@ static int fat_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
static int fat_close(struct device_d *dev, FILE *f)
|
static int fat_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct fat_priv *priv = dev->priv;
|
struct fat_priv *priv = dev->priv;
|
||||||
FIL *f_file = f->inode;
|
FIL *f_file = f->priv;
|
||||||
|
|
||||||
f_close(f_file);
|
f_close(f_file);
|
||||||
|
|
||||||
|
@ -255,7 +255,7 @@ static int fat_close(struct device_d *dev, FILE *f)
|
||||||
static int fat_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
static int fat_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
FIL *f_file = f->inode;
|
FIL *f_file = f->priv;
|
||||||
int outsize;
|
int outsize;
|
||||||
|
|
||||||
ret = f_read(f_file, buf, insize, &outsize);
|
ret = f_read(f_file, buf, insize, &outsize);
|
||||||
|
@ -270,7 +270,7 @@ static int fat_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
|
|
||||||
static loff_t fat_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
static loff_t fat_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
||||||
{
|
{
|
||||||
FIL *f_file = f->inode;
|
FIL *f_file = f->priv;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = f_lseek(f_file, pos);
|
ret = f_lseek(f_file, pos);
|
||||||
|
|
8
fs/nfs.c
8
fs/nfs.c
|
@ -1144,7 +1144,7 @@ static int nfs_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
if (IS_ERR(priv))
|
if (IS_ERR(priv))
|
||||||
return PTR_ERR(priv);
|
return PTR_ERR(priv);
|
||||||
|
|
||||||
file->inode = priv;
|
file->priv = priv;
|
||||||
file->size = s.st_size;
|
file->size = s.st_size;
|
||||||
|
|
||||||
priv->fifo = kfifo_alloc(1024);
|
priv->fifo = kfifo_alloc(1024);
|
||||||
|
@ -1158,7 +1158,7 @@ static int nfs_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
|
|
||||||
static int nfs_close(struct device_d *dev, FILE *file)
|
static int nfs_close(struct device_d *dev, FILE *file)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = file->inode;
|
struct file_priv *priv = file->priv;
|
||||||
|
|
||||||
nfs_do_close(priv);
|
nfs_do_close(priv);
|
||||||
|
|
||||||
|
@ -1173,7 +1173,7 @@ static int nfs_write(struct device_d *_dev, FILE *file, const void *inbuf,
|
||||||
|
|
||||||
static int nfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
static int nfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = file->inode;
|
struct file_priv *priv = file->priv;
|
||||||
|
|
||||||
if (insize > 1024)
|
if (insize > 1024)
|
||||||
insize = 1024;
|
insize = 1024;
|
||||||
|
@ -1189,7 +1189,7 @@ static int nfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
||||||
|
|
||||||
static loff_t nfs_lseek(struct device_d *dev, FILE *file, loff_t pos)
|
static loff_t nfs_lseek(struct device_d *dev, FILE *file, loff_t pos)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = file->inode;
|
struct file_priv *priv = file->priv;
|
||||||
|
|
||||||
file->pos = pos;
|
file->pos = pos;
|
||||||
kfifo_reset(priv->fifo);
|
kfifo_reset(priv->fifo);
|
||||||
|
|
|
@ -104,7 +104,7 @@ static int omap4_usbbootfs_open(
|
||||||
if (IS_ERR(priv))
|
if (IS_ERR(priv))
|
||||||
return PTR_ERR(priv);
|
return PTR_ERR(priv);
|
||||||
|
|
||||||
file->inode = priv;
|
file->priv = priv;
|
||||||
file->size = priv->size;
|
file->size = priv->size;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -123,14 +123,14 @@ static int omap4_usbbootfs_do_close(struct file_priv *priv)
|
||||||
|
|
||||||
static int omap4_usbbootfs_close(struct device_d *dev, FILE *f)
|
static int omap4_usbbootfs_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = f->inode;
|
struct file_priv *priv = f->priv;
|
||||||
return omap4_usbbootfs_do_close(priv);
|
return omap4_usbbootfs_do_close(priv);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int omap4_usbbootfs_read(
|
static int omap4_usbbootfs_read(
|
||||||
struct device_d *dev, FILE *f, void *buf, size_t size)
|
struct device_d *dev, FILE *f, void *buf, size_t size)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = f->inode;
|
struct file_priv *priv = f->priv;
|
||||||
u32 data;
|
u32 data;
|
||||||
|
|
||||||
if (size > priv->size - f->pos)
|
if (size > priv->size - f->pos)
|
||||||
|
|
|
@ -311,7 +311,7 @@ static int ramfs_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
file->size = node->size;
|
file->size = node->size;
|
||||||
file->inode = node;
|
file->priv = node;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -351,7 +351,7 @@ static struct ramfs_chunk *ramfs_find_chunk(struct ramfs_inode *node, int chunk)
|
||||||
|
|
||||||
static int ramfs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
static int ramfs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct ramfs_inode *node = (struct ramfs_inode *)f->inode;
|
struct ramfs_inode *node = f->priv;
|
||||||
int chunk;
|
int chunk;
|
||||||
struct ramfs_chunk *data;
|
struct ramfs_chunk *data;
|
||||||
int ofs;
|
int ofs;
|
||||||
|
@ -400,7 +400,7 @@ static int ramfs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
|
|
||||||
static int ramfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
static int ramfs_write(struct device_d *_dev, FILE *f, const void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct ramfs_inode *node = (struct ramfs_inode *)f->inode;
|
struct ramfs_inode *node = f->priv;
|
||||||
int chunk;
|
int chunk;
|
||||||
struct ramfs_chunk *data;
|
struct ramfs_chunk *data;
|
||||||
int ofs;
|
int ofs;
|
||||||
|
@ -455,7 +455,7 @@ static loff_t ramfs_lseek(struct device_d *dev, FILE *f, loff_t pos)
|
||||||
|
|
||||||
static int ramfs_truncate(struct device_d *dev, FILE *f, ulong size)
|
static int ramfs_truncate(struct device_d *dev, FILE *f, ulong size)
|
||||||
{
|
{
|
||||||
struct ramfs_inode *node = (struct ramfs_inode *)f->inode;
|
struct ramfs_inode *node = f->priv;
|
||||||
int oldchunks, newchunks;
|
int oldchunks, newchunks;
|
||||||
struct ramfs_chunk *data = node->data;
|
struct ramfs_chunk *data = node->data;
|
||||||
|
|
||||||
|
|
|
@ -469,7 +469,7 @@ static int tftp_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
if (IS_ERR(priv))
|
if (IS_ERR(priv))
|
||||||
return PTR_ERR(priv);
|
return PTR_ERR(priv);
|
||||||
|
|
||||||
file->inode = priv;
|
file->priv = priv;
|
||||||
file->size = SZ_2G;
|
file->size = SZ_2G;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -515,7 +515,7 @@ static int tftp_do_close(struct file_priv *priv)
|
||||||
|
|
||||||
static int tftp_close(struct device_d *dev, FILE *f)
|
static int tftp_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = f->inode;
|
struct file_priv *priv = f->priv;
|
||||||
|
|
||||||
return tftp_do_close(priv);
|
return tftp_do_close(priv);
|
||||||
}
|
}
|
||||||
|
@ -523,7 +523,7 @@ static int tftp_close(struct device_d *dev, FILE *f)
|
||||||
static int tftp_write(struct device_d *_dev, FILE *f, const void *inbuf,
|
static int tftp_write(struct device_d *_dev, FILE *f, const void *inbuf,
|
||||||
size_t insize)
|
size_t insize)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = f->inode;
|
struct file_priv *priv = f->priv;
|
||||||
size_t size, now;
|
size_t size, now;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -558,7 +558,7 @@ static int tftp_write(struct device_d *_dev, FILE *f, const void *inbuf,
|
||||||
|
|
||||||
static int tftp_read(struct device_d *dev, FILE *f, void *buf, size_t insize)
|
static int tftp_read(struct device_d *dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct file_priv *priv = f->inode;
|
struct file_priv *priv = f->priv;
|
||||||
size_t outsize = 0, now;
|
size_t outsize = 0, now;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -350,14 +350,14 @@ static int ubifs_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
uf->block = -1;
|
uf->block = -1;
|
||||||
|
|
||||||
file->size = inode->i_size;
|
file->size = inode->i_size;
|
||||||
file->inode = uf;
|
file->priv = uf;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ubifs_close(struct device_d *dev, FILE *f)
|
static int ubifs_close(struct device_d *dev, FILE *f)
|
||||||
{
|
{
|
||||||
struct ubifs_file *uf = f->inode;
|
struct ubifs_file *uf = f->priv;
|
||||||
struct inode *inode = uf->inode;
|
struct inode *inode = uf->inode;
|
||||||
|
|
||||||
ubifs_iput(inode);
|
ubifs_iput(inode);
|
||||||
|
@ -386,7 +386,7 @@ static int ubifs_get_block(struct ubifs_file *uf, unsigned int pos)
|
||||||
|
|
||||||
static int ubifs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
static int ubifs_read(struct device_d *_dev, FILE *f, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct ubifs_file *uf = f->inode;
|
struct ubifs_file *uf = f->priv;
|
||||||
unsigned int pos = f->pos;
|
unsigned int pos = f->pos;
|
||||||
unsigned int ofs;
|
unsigned int ofs;
|
||||||
unsigned int now;
|
unsigned int now;
|
||||||
|
|
|
@ -89,14 +89,14 @@ static int uimagefs_open(struct device_d *dev, FILE *file, const char *filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
file->size = d->size;
|
file->size = d->size;
|
||||||
file->inode = d;
|
file->priv = d;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int uimagefs_close(struct device_d *dev, FILE *file)
|
static int uimagefs_close(struct device_d *dev, FILE *file)
|
||||||
{
|
{
|
||||||
struct uimagefs_handle_data *d = file->inode;
|
struct uimagefs_handle_data *d = file->priv;
|
||||||
|
|
||||||
close(d->fd);
|
close(d->fd);
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ static int uimagefs_close(struct device_d *dev, FILE *file)
|
||||||
|
|
||||||
static int uimagefs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
static int uimagefs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
|
||||||
{
|
{
|
||||||
struct uimagefs_handle_data *d = file->inode;
|
struct uimagefs_handle_data *d = file->priv;
|
||||||
|
|
||||||
if (!uimagefs_is_data_file(d)) {
|
if (!uimagefs_is_data_file(d)) {
|
||||||
memcpy(buf, &d->data[d->pos], insize);
|
memcpy(buf, &d->data[d->pos], insize);
|
||||||
|
@ -117,7 +117,7 @@ static int uimagefs_read(struct device_d *dev, FILE *file, void *buf, size_t ins
|
||||||
|
|
||||||
static loff_t uimagefs_lseek(struct device_d *dev, FILE *file, loff_t pos)
|
static loff_t uimagefs_lseek(struct device_d *dev, FILE *file, loff_t pos)
|
||||||
{
|
{
|
||||||
struct uimagefs_handle_data *d = file->inode;
|
struct uimagefs_handle_data *d = file->priv;
|
||||||
|
|
||||||
if (uimagefs_is_data_file(d))
|
if (uimagefs_is_data_file(d))
|
||||||
lseek(d->fd, d->offset + pos, SEEK_SET);
|
lseek(d->fd, d->offset + pos, SEEK_SET);
|
||||||
|
|
|
@ -30,7 +30,7 @@ typedef struct filep {
|
||||||
loff_t size; /* The size of this inode */
|
loff_t size; /* The size of this inode */
|
||||||
ulong flags; /* the O_* flags from open */
|
ulong flags; /* the O_* flags from open */
|
||||||
|
|
||||||
void *inode; /* private to the filesystem driver */
|
void *priv; /* private to the filesystem driver */
|
||||||
|
|
||||||
/* private fields. Mapping between FILE and filedescriptor number */
|
/* private fields. Mapping between FILE and filedescriptor number */
|
||||||
int no;
|
int no;
|
||||||
|
|
Loading…
Reference in New Issue