fat: restructure export operations
Subsystems (2)
PATCH 2/5 fat: restructure export operations
From: Namjae Jeon <[email protected]>
Define two nfs export_operation structures,one for 'stale_rw' mounts and the other for 'nostale_ro'.The former uses the generic export_encode_fh function to encode file handle, while the latter uses fat_encode_fh.
Since inode number is not needed for nostale_ro, remove it from struct fat_fid and repack other needed info viz. i_pos and i_generation.
--- fs/fat/fat.h | 2 + fs/fat/inode.c | 12 ++---- fs/fat/nfs.c | 127 +++++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 104 insertions(+), 37 deletions(-)
fs/fat/fat.h +2 -0
@@ -391,6 +391,8 @@ void fat_cache_destroy(void);/* fat/nfs.c */ struct fid ; +extern const struct export_operations fat_export_ops; +extern const struct export_operations fat_export_ops_nostale;extern int fat_encode_fh (struct inode *inode,__u32 *fh,int *lenp,struct inode *parent); extern struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fid,
fs/fat/inode.c +3 -9
@@ -18,7 +18,6 @@#include <linux/pagemap.h> #include <linux/mpage.h> #include <linux/buffer_head.h> -#include <linux/exportfs.h> #include <linux/mount.h> #include <linux/vfs.h> #include <linux/parser.h>
@@ -703,13 +702,6 @@ static const struct super_operations fat_sops = { .show_options = fat_show_options, }; -static const struct export_operations fat_export_ops = { - .encode_fh = fat_encode_fh, - .fh_to_dentry = fat_fh_to_dentry, - .fh_to_parent = fat_fh_to_parent, - .get_parent = fat_get_parent, -}; -static int fat_show_options (struct seq_file *m,struct dentry *root) {struct msdos_sb_info *sbi =MSDOS_SB (root->d_sb);
@@ -1118,8 +1110,10 @@ out: opts->allow_utime = ~opts->fs_dmask & (S_IWGRP |S_IWOTH );if (opts->unicode_xlate) opts->utf8 =0 ; -if (opts->nfs ==FAT_NFS_NOSTALE_RO ) +if (opts->nfs ==FAT_NFS_NOSTALE_RO ) { sb->s_flags |=MS_RDONLY ; + sb->s_export_op = &fat_export_ops_nostale; + }return 0 ; }
fs/fat/nfs.c +99 -28
193 lines not on this page · raw message
Signature · 1 line
1.7.9.5
OGAWA Hirofumi
maintainerfs/fat/nfs.c line 27
Quoted 2 lines · Namjae Jeon
fs/fat/nfs.c +2
-0+#define FILEID_FAT_WITHOUT_PARENT (offsetof(struct fat_fid, parent_i_pos_hi)/4) +#define FILEID_FAT_WITH_PARENT (sizeof(struct fat_fid)/4)
This is strange.
FILEID_FAT_WITH_PARENT and FILEID_FAT_WITHOUT_PARENT should be fh_type, not length.
fs/fat/nfs.c fat_encode_fh(struct inode *inode, __u32 *fh, int *lenp, struct inode *parent) · line 112
Quoted 10 lines
int
fs/fat/nfs.c +2
-1-fat_encode_fh(struct inode *inode, __u32 *fh, int *lenp, struct inode *parent) +fat_encode_fh_nostale(struct inode *inode, __u32 *fh, int *lenp, + struct inode *parent) { int len = *lenp;struct msdos_sb_info *sbi =MSDOS_SB (inode->i_sb);@@ -97,24 +111,26 @@ fat_encode_fh(struct inode *inode, __u32 *fh, int *lenp, struct inode *parent)loff_t i_pos;int type =FILEID_INO32_GEN ;
Please don't re-use FILEID_INO32_GEN(_PARENT) for different FH format. Instead of those, we should use FILEID_FAT_(WITH|WITHOUT)_PARENT here.
Quoted 11 lines
fs/fat/nfs.c +4
-4-if (parent && (len <5 )) { - *lenp =5 ; +if (parent && (len <FILEID_FAT_WITH_PARENT )) { + *lenp =FILEID_FAT_WITH_PARENT ;return 255 ; - }else if (len <3 ) { - *lenp =3 ; + }else if (len <FILEID_FAT_WITHOUT_PARENT ) { + *lenp =FILEID_FAT_WITHOUT_PARENT ;return 255 ; }
fs/fat/nfs.c fat_encode_fh(struct inode *inode, __u32 *fh, int *lenp, struct inode *parent) · line 126
Quoted 10 lines
fs/fat/nfs.c +4
-4i_pos =fat_i_pos_read (sbi, inode); - *lenp =3 ; - fid->ino = inode->i_ino; - fid->gen = inode->i_generation; - fid->i_pos = i_pos; + *lenp =FILEID_FAT_WITHOUT_PARENT ; + fid->i_gen = inode->i_generation; + fid->i_pos_low = i_pos &0xFFFFFFFF ; + fid->i_pos_hi = (i_pos >>32 ) &0xFF ;
0xff is 0xffff actually?
Quoted 19 lines
fs/fat/nfs.c +5
-5if (parent) { - fid->parent_ino = parent->i_ino; - fid->parent_gen = parent->i_generation; + i_pos =fat_i_pos_read (sbi, parent); + fid->parent_i_pos_hi = (i_pos >>32 ) &0xFF ; + fid->parent_i_pos_low = i_pos &0xFFFFFFFF ; + fid->parent_i_gen = parent->i_generation; type =FILEID_INO32_GEN_PARENT ; - *lenp =5 ; + *lenp =FILEID_FAT_WITH_PARENT ; }return type;@@ -128,14 +144,36 @@ struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fh, int fh_len, int fh_type) {struct inode *inode =NULL ; -struct fat_fid *fid = (struct fat_fid *)fh; -if (fh_len <3 )
fs/fat/nfs.c struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fh, · line 155
Quoted 10 lines
fs/fat/nfs.c +4
-1+if (fh_len <2 )return NULL ;switch (fh_type) {case FILEID_INO32_GEN :case FILEID_INO32_GEN_PARENT : - inode =fat_nfs_get_inode (sb, fid->ino, fid->gen, fid->i_pos); + inode =fat_nfs_get_inode (sb, fh->i32.ino, fh->i32.gen,0 ); +break ; + }
We can use generic_fh_to_dentry() here, instead, opencode. Right?
Rename fat_nfs_get_inode() to __fat_nfs_get_inode(). And add
fat_nfs_get_inode(struct super_block *sb, u64 ino, u32 gen)
{
return __fat_nfs_get_inode(sb, fh->i32.ino, fh->i32.gen, 0);
}fs/fat/nfs.c struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fh, · line 173
Quoted 8 lines
fs/fat/nfs.c +8
-0+switch (fh_type) { +case FILEID_INO32_GEN : +if (fh_len <FILEID_FAT_WITHOUT_PARENT ) +return NULL ; +case FILEID_INO32_GEN_PARENT : +if ((fh_len <FILEID_FAT_WITH_PARENT ) && + (fh_type ==FILEID_INO32_GEN_PARENT )) +return NULL ;
Why do we have to care unused fields here?
Quoted 16 lines
fs/fat/nfs.c +7
-1+ i_pos = fid->i_pos_hi; + i_pos = (i_pos <<32 ) | (fid->i_pos_low); + inode =fat_nfs_get_inode (sb,0 , fid->i_gen, i_pos);break ; }@@ -147,18 +185,39 @@ struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fh,* Find the parent for a file specified by NFS handle. * This requires that the handle contain the i_ino of the parent. */ -struct dentry *fat_fh_to_parent(struct super_block *sb, struct fid *fh, +struct dentry *fat_fh_to_parent (struct super_block *sb,struct fid *fid, +int fh_len,int fh_type) +{ +struct inode *inode =NULL ;
fs/fat/nfs.c struct dentry *fat_fh_to_dentry(struct super_block *sb, struct fid *fh, · line 201
Quoted 10 lines
fs/fat/nfs.c +10
-0+ +if (fh_len <2 ) +return NULL ; + +switch (fh_type) { +case FILEID_INO32_GEN : +case FILEID_INO32_GEN_PARENT : + inode =fat_nfs_get_inode (sb, fid->i32.ino, fid->i32.gen,0 ); +break ; + }
Don't opencode generic_fh_to_parent() here too. And this is wrong.
Quoted 22 lines
fs/fat/nfs.c +7
-3+struct dentry *fat_fh_to_parent_nostale (struct super_block *sb,struct fid *fh,int fh_len,int fh_type) {struct inode *inode =NULL ;struct fat_fid *fid = (struct fat_fid *)fh; -if (fh_len <5 ) +loff_t i_pos; + +if (fh_len <FILEID_FAT_WITH_PARENT )return NULL ;switch (fh_type) {case FILEID_INO32_GEN_PARENT : - inode =fat_nfs_get_inode (sb, fid->parent_ino, fid->parent_gen, - fid->i_pos); + i_pos = fid->parent_i_pos_hi; + i_pos = (i_pos <<32 ) | (fid->parent_i_pos_low); + inode =fat_nfs_get_inode (sb,0 , fid->parent_i_gen, i_pos);break ; }
fs/fat/nfs.c out: · line 370
Quoted 9 lines
fs/fat/nfs.c +6
-0@@ -303,3 +362,15 @@ out:return d_obtain_alias (parent_inode); } + +const struct export_operations fat_export_ops = { + .fh_to_dentry = fat_fh_to_dentry, + .fh_to_parent = fat_fh_to_parent, + .get_parent = fat_get_parent, +};
Need empty line here.
Quoted 6 lines
fs/fat/nfs.c +6
-0+const struct export_operations fat_export_ops_nostale = { + .encode_fh = fat_encode_fh_nostale, + .fh_to_dentry = fat_fh_to_dentry_nostale, + .fh_to_parent = fat_fh_to_parent_nostale, + .get_parent = fat_get_parent, +};
Signature · 1 line
OGAWA Hirofumi <[email protected]>