diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-05 15:47:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-05 15:47:38 +0100 |
| commit | da1a9005c28e1b2b15bf9557809b0ca47dc7b57b (patch) | |
| tree | b93524bcc272636013ae66e31c428764b1800359 /include | |
| parent | 8a55a7ddf120affd2145f06f2d52fdfbe13cb01d (diff) | |
| parent | 6aaba64b0c7044c242329499d5d4c53c3d0cde3a (diff) | |
| download | barebox-da1a9005c28e1b2b15bf9557809b0ca47dc7b57b.tar.gz barebox-da1a9005c28e1b2b15bf9557809b0ca47dc7b57b.tar.xz | |
Merge branch 'for-next/fs'
Diffstat (limited to 'include')
| -rw-r--r-- | include/fs.h | 5 | ||||
| -rw-r--r-- | include/libfile.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/fs.h b/include/fs.h index b2541a4ee5..63e35ca815 100644 --- a/include/fs.h +++ b/include/fs.h @@ -23,7 +23,8 @@ typedef struct dir { } DIR; typedef struct filep { - struct device_d *dev; /* The device this FILE belongs to */ + struct fs_device_d *fsdev; /* The device this FILE belongs to */ + char *path; loff_t pos; /* current position in stream */ #define FILE_SIZE_STREAM ((loff_t) -1) loff_t size; /* The size of this inode */ @@ -82,7 +83,6 @@ struct fs_driver_d { unsigned long flags; }; -#define dev_to_fs_driver(d) container_of(d->driver, struct fs_driver_d, drv) #define dev_to_fs_device(d) container_of(d, struct fs_device_d, dev) extern struct list_head fs_device_list; @@ -114,6 +114,7 @@ int close(int fd); int flush(int fd); int lstat(const char *filename, struct stat *s); int stat(const char *filename, struct stat *s); +int fstat(int fd, struct stat *s); ssize_t read(int fd, void *buf, size_t count); ssize_t pread(int fd, void *buf, size_t count, loff_t offset); int ioctl(int fd, int request, void *buf); diff --git a/include/libfile.h b/include/libfile.h index 4a25a9153c..6c48ce0b68 100644 --- a/include/libfile.h +++ b/include/libfile.h @@ -15,4 +15,6 @@ int write_file(const char *filename, void *buf, size_t size); int copy_file(const char *src, const char *dst, int verbose); +int compare_file(const char *f1, const char *f2); + #endif /* __LIBFILE_H */ |