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/nfs.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/nfs.c')
-rw-r--r-- | fs/fat/nfs.c | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/fs/fat/nfs.c b/fs/fat/nfs.c index d59c02543a10..0748196889b2 100644 --- a/fs/fat/nfs.c +++ b/fs/fat/nfs.c | |||
@@ -50,19 +50,50 @@ static struct inode *fat_dget(struct super_block *sb, int i_logstart) | |||
50 | return inode; | 50 | return inode; |
51 | } | 51 | } |
52 | 52 | ||
53 | static struct inode *fat_ilookup(struct super_block *sb, u64 ino, loff_t i_pos) | ||
54 | { | ||
55 | if (MSDOS_SB(sb)->options.nfs == FAT_NFS_NOSTALE_RO) | ||
56 | return fat_iget(sb, i_pos); | ||
57 | |||
58 | else { | ||
59 | if ((ino < MSDOS_ROOT_INO) || (ino == MSDOS_FSINFO_INO)) | ||
60 | return NULL; | ||
61 | return ilookup(sb, ino); | ||
62 | } | ||
63 | } | ||
64 | |||
53 | static struct inode *__fat_nfs_get_inode(struct super_block *sb, | 65 | static struct inode *__fat_nfs_get_inode(struct super_block *sb, |
54 | u64 ino, u32 generation, loff_t i_pos) | 66 | u64 ino, u32 generation, loff_t i_pos) |
55 | { | 67 | { |
56 | struct inode *inode; | 68 | struct inode *inode = fat_ilookup(sb, ino, i_pos); |
57 | |||
58 | if ((ino < MSDOS_ROOT_INO) || (ino == MSDOS_FSINFO_INO)) | ||
59 | return NULL; | ||
60 | 69 | ||
61 | inode = ilookup(sb, ino); | ||
62 | if (inode && generation && (inode->i_generation != generation)) { | 70 | if (inode && generation && (inode->i_generation != generation)) { |
63 | iput(inode); | 71 | iput(inode); |
64 | inode = NULL; | 72 | inode = NULL; |
65 | } | 73 | } |
74 | if (inode == NULL && MSDOS_SB(sb)->options.nfs == FAT_NFS_NOSTALE_RO) { | ||
75 | struct buffer_head *bh = NULL; | ||
76 | struct msdos_dir_entry *de ; | ||
77 | sector_t blocknr; | ||
78 | int offset; | ||
79 | fat_get_blknr_offset(MSDOS_SB(sb), i_pos, &blocknr, &offset); | ||
80 | bh = sb_bread(sb, blocknr); | ||
81 | if (!bh) { | ||
82 | fat_msg(sb, KERN_ERR, | ||
83 | "unable to read block(%llu) for building NFS inode", | ||
84 | (llu)blocknr); | ||
85 | return inode; | ||
86 | } | ||
87 | de = (struct msdos_dir_entry *)bh->b_data; | ||
88 | /* If a file is deleted on server and client is not updated | ||
89 | * yet, we must not build the inode upon a lookup call. | ||
90 | */ | ||
91 | if (IS_FREE(de[offset].name)) | ||
92 | inode = NULL; | ||
93 | else | ||
94 | inode = fat_build_inode(sb, &de[offset], i_pos); | ||
95 | brelse(bh); | ||
96 | } | ||
66 | 97 | ||
67 | return inode; | 98 | return inode; |
68 | } | 99 | } |