diff options
author | Namjae Jeon <namjae.jeon@samsung.com> | 2013-04-29 19:21:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:41 -0400 |
commit | 8fceb4e0171f6bf64db756c65b2ce5f15aed8b4d (patch) | |
tree | d5dcc788292169e2bf4b9cd96111d2c2c46777fb /fs/fat/inode.c | |
parent | ea3983ace6b79c96e6ab3d3837e2eaf81ab881e2 (diff) |
fat (exportfs): rebuild inode if ilookup() fails
If the cache lookups fail,use the i_pos value to find the directory entry
of the inode and rebuild the inode.Since this involves accessing the FAT
media, do this only if the nostale_ro nfs mount option is specified.
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Ravishankar N <ravi.n1@samsung.com>
Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com>
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 27f49f4fa0d3..971ba7d549da 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -443,12 +443,25 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) | |||
443 | return 0; | 443 | return 0; |
444 | } | 444 | } |
445 | 445 | ||
446 | static inline void fat_lock_build_inode(struct msdos_sb_info *sbi) | ||
447 | { | ||
448 | if (sbi->options.nfs == FAT_NFS_NOSTALE_RO) | ||
449 | mutex_lock(&sbi->nfs_build_inode_lock); | ||
450 | } | ||
451 | |||
452 | static inline void fat_unlock_build_inode(struct msdos_sb_info *sbi) | ||
453 | { | ||
454 | if (sbi->options.nfs == FAT_NFS_NOSTALE_RO) | ||
455 | mutex_unlock(&sbi->nfs_build_inode_lock); | ||
456 | } | ||
457 | |||
446 | struct inode *fat_build_inode(struct super_block *sb, | 458 | struct inode *fat_build_inode(struct super_block *sb, |
447 | struct msdos_dir_entry *de, loff_t i_pos) | 459 | struct msdos_dir_entry *de, loff_t i_pos) |
448 | { | 460 | { |
449 | struct inode *inode; | 461 | struct inode *inode; |
450 | int err; | 462 | int err; |
451 | 463 | ||
464 | fat_lock_build_inode(MSDOS_SB(sb)); | ||
452 | inode = fat_iget(sb, i_pos); | 465 | inode = fat_iget(sb, i_pos); |
453 | if (inode) | 466 | if (inode) |
454 | goto out; | 467 | goto out; |
@@ -468,6 +481,7 @@ struct inode *fat_build_inode(struct super_block *sb, | |||
468 | fat_attach(inode, i_pos); | 481 | fat_attach(inode, i_pos); |
469 | insert_inode_hash(inode); | 482 | insert_inode_hash(inode); |
470 | out: | 483 | out: |
484 | fat_unlock_build_inode(MSDOS_SB(sb)); | ||
471 | return inode; | 485 | return inode; |
472 | } | 486 | } |
473 | 487 | ||
@@ -1247,6 +1261,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, | |||
1247 | sb->s_magic = MSDOS_SUPER_MAGIC; | 1261 | sb->s_magic = MSDOS_SUPER_MAGIC; |
1248 | sb->s_op = &fat_sops; | 1262 | sb->s_op = &fat_sops; |
1249 | sb->s_export_op = &fat_export_ops; | 1263 | sb->s_export_op = &fat_export_ops; |
1264 | mutex_init(&sbi->nfs_build_inode_lock); | ||
1250 | ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL, | 1265 | ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL, |
1251 | DEFAULT_RATELIMIT_BURST); | 1266 | DEFAULT_RATELIMIT_BURST); |
1252 | 1267 | ||