v2 - [PATCH] filesystem helpers for custom 'struct file's
Subsystems (6)
RFC 1/1 v2 - [PATCH] filesystem helpers for custom 'struct file's
Some filesystems forego the vfs and may_open() and create their own 'struct file's.
This patch creates a couple of helper functions which can be used by these filesystems, and will provide a unified place which the r/o bind mount code may patch.
---
lxc-dave/include/linux/file.h | 8 ++++ lxc-dave/fs/file_table.c | 30 +++++++++++++++ lxc-dave/fs/hugetlbfs/inode.c | 22 ++++------- lxc-dave/mm/shmem.c | 22 ++++------- lxc-dave/mm/tiny-shmem.c | 24 ++++-------- lxc-dave/net/socket.c | 82 +++++++++++++++++------------------------- 6 files changed, 99 insertions(+), 89 deletions(-)
include/linux/file.h renamed from include/linux/file.h~B0-helpers-for-custom-struct_files +8 -0
@@ -67,6 +67,14 @@ struct files_struct {extern void FASTCALL (__fput (struct file *));extern void FASTCALL (fput (struct file *)); +struct file_operations ; +struct vfsmount ; +struct dentry ; +extern int init_file (struct file *,struct vfsmount *,struct dentry *dentry, +mode_t mode,const struct file_operations *fop); +extern struct file *alloc_file (struct vfsmount *,struct dentry *dentry, +mode_t mode,const struct file_operations *fop); +static inline void fput_light (struct file *file,int fput_needed) {if (unlikely (fput_needed))
fs/file_table.c renamed from fs/file_table.c~B0-helpers-for-custom-struct_files +30 -0
@@ -140,6 +140,36 @@ fail:EXPORT_SYMBOL (get_empty_filp); +struct file *alloc_file (struct vfsmount *mnt,struct dentry *dentry, +mode_t mode,const struct file_operations *fop) +{ +struct file *file; + + file =get_empty_filp (); +if (!file) +return NULL ; + +init_file (file, mnt, dentry, mode, fop); +return file; +} + +EXPORT_SYMBOL (alloc_file); + +int init_file (struct file *file,struct vfsmount *mnt, +struct dentry *dentry,mode_t mode, +const struct file_operations *fop) +{ +int error =0 ; + file->f_vfsmnt =mntget (mnt); + file->f_dentry = dentry; + file->f_mapping = dentry->d_inode->i_mapping; + file->f_mode = mode; + file->f_op = fop; +return error; +} + +EXPORT_SYMBOL (init_file); + void fastcall fput(struct file *file) {if (atomic_dec_and_test (&file->f_count))
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~B0-helpers-for-custom-struct_files +9 -13
@@ -764,16 +764,11 @@ struct file *hugetlb_zero_setup(size_t sif (!dentry) goto out_shm_unlock; - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto out_dentry; - error = -ENOSPC ; inode =hugetlbfs_get_inode (root->d_sb, current->fsuid, current->fsgid,S_IFREG |S_IRWXUGO ,0 );if (!inode) - goto out_file; + goto out_dentry; error = -ENOMEM ;if (hugetlb_reserve_pages (inode,0 , size >>HPAGE_SHIFT ))
@@ -782,17 +777,18 @@ struct file *hugetlb_zero_setup(size_t sd_instantiate (dentry, inode); inode->i_size = size; inode->i_nlink =0 ; - file->f_vfsmnt =mntget (hugetlbfs_vfsmount); - file->f_dentry = dentry; - file->f_mapping = inode->i_mapping; - file->f_op = &hugetlbfs_file_operations; - file->f_mode =FMODE_WRITE |FMODE_READ ; + + error = -ENFILE ; + file =alloc_file (hugetlbfs_vfsmount, dentry, +FMODE_WRITE |FMODE_READ , + &hugetlbfs_file_operations); +if (!file) + goto out_inode; +return file; out_inode:iput (inode); -out_file: -put_filp (file); out_dentry:dput (dentry); out_shm_unlock:
mm/shmem.c renamed from mm/shmem.c~B0-helpers-for-custom-struct_files +9 -13
@@ -2464,29 +2464,25 @@ struct file *shmem_file_setup(char *nameif (!dentry) goto put_memory; - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto put_dentry; - error = -ENOSPC ; inode =shmem_get_inode (root->d_sb,S_IFREG |S_IRWXUGO ,0 );if (!inode) - goto close_file; + goto put_dentry; + + error = -ENFILE ; + file =alloc_file (shm_mnt, dentry,FMODE_WRITE |FMODE_READ , + &shmem_file_operations); +if (!file) + goto put_inode;SHMEM_I (inode)->flags = flags &VM_ACCOUNT ;d_instantiate (dentry, inode); inode->i_size = size; inode->i_nlink =0 ;/* It is unlinked */ - file->f_vfsmnt =mntget (shm_mnt); - file->f_dentry = dentry; - file->f_mapping = inode->i_mapping; - file->f_op = &shmem_file_operations; - file->f_mode =FMODE_WRITE |FMODE_READ ;return file; -close_file: -put_filp (file); +put_inode: +iput (inode); put_dentry:dput (dentry); put_memory:
mm/tiny-shmem.c renamed from mm/tiny-shmem.c~B0-helpers-for-custom-struct_files +9 -15
@@ -66,24 +66,19 @@ struct file *shmem_file_setup(char *nameif (!dentry) goto put_memory; - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto put_dentry; - error = -ENOSPC ; inode =ramfs_get_inode (root->d_sb,S_IFREG |S_IRWXUGO ,0 );if (!inode) - goto close_file; + goto put_dentry;d_instantiate (dentry, inode); - inode->i_nlink =0 ;/* It is unlinked */ + error = -ENFILE ; + file =alloc_file (shm_mnt, dentry,FMODE_WRITE |FMODE_READ , + &ramfs_file_operations); +if (!file) + goto put_inode; - file->f_vfsmnt =mntget (shm_mnt); - file->f_dentry = dentry; - file->f_mapping = inode->i_mapping; - file->f_op = &ramfs_file_operations; - file->f_mode =FMODE_WRITE |FMODE_READ ; + inode->i_nlink =0 ;/* It is unlinked */ /* notify everyone as to the change of file size */ error =do_truncate (dentry, size,0 , file);
@@ -91,9 +86,8 @@ struct file *shmem_file_setup(char *name goto close_file;return file; - -close_file: -put_filp (file); +put_inode: +iput (inode); put_dentry:dput (dentry); put_memory:
net/socket.c renamed from net/socket.c~B0-helpers-for-custom-struct_files +34 -48
143 lines not on this page · raw message
_
I forgot to refresh that one last time. Here's the version that actually removed the f_init function.
This version takes into account some of Christoph's comments.
--
Some filesystems forego the vfs and may_open() and create their own 'struct file's.
This patch creates a couple of helper functions which can be used by these filesystems, and will provide a unified place which the r/o bind mount code may patch.
---
lxc-dave/include/linux/file.h | 6 +++ lxc-dave/fs/file_table.c | 18 +++++++++ lxc-dave/fs/hugetlbfs/inode.c | 22 ++++------- lxc-dave/mm/shmem.c | 22 ++++------- lxc-dave/mm/tiny-shmem.c | 24 ++++-------- lxc-dave/net/socket.c | 82 +++++++++++++++++------------------------- 6 files changed, 85 insertions(+), 89 deletions(-)
include/linux/file.h renamed from include/linux/file.h~B0-helpers-for-custom-struct_files +6 -0
@@ -67,6 +67,12 @@ struct files_struct {extern void FASTCALL (__fput (struct file *));extern void FASTCALL (fput (struct file *)); +struct file_operations ; +struct vfsmount ; +struct dentry ; +extern struct file *alloc_file (struct vfsmount *,struct dentry *dentry, +mode_t mode,const struct file_operations *fop); +static inline void fput_light (struct file *file,int fput_needed) {if (unlikely (fput_needed))
fs/file_table.c renamed from fs/file_table.c~B0-helpers-for-custom-struct_files +18 -0
@@ -140,6 +140,24 @@ fail:EXPORT_SYMBOL (get_empty_filp); +struct file *alloc_file (struct vfsmount *mnt,struct dentry *dentry, +mode_t mode,const struct file_operations *fop) +{ +struct file *file; + + file =get_empty_filp (); +if (!file) +return NULL ; + + file->f_vfsmnt =mntget (mnt); + file->f_dentry = dentry; + file->f_mapping = dentry->d_inode->i_mapping; + file->f_mode = mode; + file->f_op = fop; +return file; +} +EXPORT_SYMBOL (alloc_file); + void fastcall fput(struct file *file) {if (atomic_dec_and_test (&file->f_count))
fs/hugetlbfs/inode.c renamed from fs/hugetlbfs/inode.c~B0-helpers-for-custom-struct_files +9 -13
@@ -764,16 +764,11 @@ struct file *hugetlb_zero_setup(size_t sif (!dentry) goto out_shm_unlock; - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto out_dentry; - error = -ENOSPC ; inode =hugetlbfs_get_inode (root->d_sb, current->fsuid, current->fsgid,S_IFREG |S_IRWXUGO ,0 );if (!inode) - goto out_file; + goto out_dentry; error = -ENOMEM ;if (hugetlb_reserve_pages (inode,0 , size >>HPAGE_SHIFT ))
@@ -782,17 +777,18 @@ struct file *hugetlb_zero_setup(size_t sd_instantiate (dentry, inode); inode->i_size = size; inode->i_nlink =0 ; - file->f_vfsmnt =mntget (hugetlbfs_vfsmount); - file->f_dentry = dentry; - file->f_mapping = inode->i_mapping; - file->f_op = &hugetlbfs_file_operations; - file->f_mode =FMODE_WRITE |FMODE_READ ; + + error = -ENFILE ; + file =alloc_file (hugetlbfs_vfsmount, dentry, +FMODE_WRITE |FMODE_READ , + &hugetlbfs_file_operations); +if (!file) + goto out_inode; +return file; out_inode:iput (inode); -out_file: -put_filp (file); out_dentry:dput (dentry); out_shm_unlock:
mm/shmem.c renamed from mm/shmem.c~B0-helpers-for-custom-struct_files +9 -13
@@ -2464,29 +2464,25 @@ struct file *shmem_file_setup(char *nameif (!dentry) goto put_memory; - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto put_dentry; - error = -ENOSPC ; inode =shmem_get_inode (root->d_sb,S_IFREG |S_IRWXUGO ,0 );if (!inode) - goto close_file; + goto put_dentry; + + error = -ENFILE ; + file =alloc_file (shm_mnt, dentry,FMODE_WRITE |FMODE_READ , + &shmem_file_operations); +if (!file) + goto put_inode;SHMEM_I (inode)->flags = flags &VM_ACCOUNT ;d_instantiate (dentry, inode); inode->i_size = size; inode->i_nlink =0 ;/* It is unlinked */ - file->f_vfsmnt =mntget (shm_mnt); - file->f_dentry = dentry; - file->f_mapping = inode->i_mapping; - file->f_op = &shmem_file_operations; - file->f_mode =FMODE_WRITE |FMODE_READ ;return file; -close_file: -put_filp (file); +put_inode: +iput (inode); put_dentry:dput (dentry); put_memory:
mm/tiny-shmem.c renamed from mm/tiny-shmem.c~B0-helpers-for-custom-struct_files +9 -15
@@ -66,24 +66,19 @@ struct file *shmem_file_setup(char *nameif (!dentry) goto put_memory; - error = -ENFILE ; - file =get_empty_filp (); -if (!file) - goto put_dentry; - error = -ENOSPC ; inode =ramfs_get_inode (root->d_sb,S_IFREG |S_IRWXUGO ,0 );if (!inode) - goto close_file; + goto put_dentry;d_instantiate (dentry, inode); - inode->i_nlink =0 ;/* It is unlinked */ + error = -ENFILE ; + file =alloc_file (shm_mnt, dentry,FMODE_WRITE |FMODE_READ , + &ramfs_file_operations); +if (!file) + goto put_inode; - file->f_vfsmnt =mntget (shm_mnt); - file->f_dentry = dentry; - file->f_mapping = inode->i_mapping; - file->f_op = &ramfs_file_operations; - file->f_mode =FMODE_WRITE |FMODE_READ ; + inode->i_nlink =0 ;/* It is unlinked */ /* notify everyone as to the change of file size */ error =do_truncate (dentry, size,0 , file);
@@ -91,9 +86,8 @@ struct file *shmem_file_setup(char *name goto close_file;return file; - -close_file: -put_filp (file); +put_inode: +iput (inode); put_dentry:dput (dentry); put_memory:
net/socket.c renamed from net/socket.c~B0-helpers-for-custom-struct_files +34 -48
143 lines not on this page · raw message
diff -puN fs/proc/base.c~B0-helpers-for-custom-struct_files fs/proc/base.c _