Since dcache support was added, we had two structs representing files: struct file and type struct filep FILE. The former was used only for listing files in ->iterate and the latter everywhere else for representing an open file (descriptor). This series aligns the members of both struct sufficiently and then merges them to simplify porting kernel code. Ahmad Fatoum (8): fs: derive file descriptor number by pointer arithmetic fs: drop ifdefs in linux/fs.h fs: retire FILE.in_use member fs: align FILE struct member names with upstream struct file fs: fat: rename f_size to f_len fs: replace FILE.size by f_inode.i_size fs: merge struct file and struct filep fs: retire FILE typdef fs/bpkfs.c | 18 ++--- fs/cramfs/cramfs.c | 4 +- fs/devfs.c | 56 ++++++------- fs/efi.c | 28 +++---- fs/efivarfs.c | 34 ++++---- fs/ext4/ext_barebox.c | 4 +- fs/fat/fat-pbl.c | 2 +- fs/fat/fat.c | 30 +++---- fs/fat/ff.h | 2 +- fs/fs.c | 178 ++++++++++++++++++++--------------------- fs/jffs2/fs.c | 18 ++--- fs/nfs.c | 23 +++--- fs/omap4_usbbootfs.c | 22 ++--- fs/pstore/fs.c | 16 ++-- fs/ramfs.c | 16 ++-- fs/ratpfs.c | 36 ++++----- fs/smhfs.c | 28 +++---- fs/squashfs/squashfs.c | 15 ++-- fs/tftp.c | 26 +++--- fs/ubifs/ubifs.c | 17 ++-- fs/ubootvarfs.c | 10 +-- fs/uimagefs.c | 20 ++--- include/driver.h | 6 +- include/fs.h | 42 +++------- include/linux/fs.h | 25 ++---- 25 files changed, 318 insertions(+), 358 deletions(-) -- 2.39.5
