Commit f21735d5873ad6c0d71fc15ebbbeda9ef445009b
Committed by
Linus Torvalds
1 parent
2628b7a6ac
fat: move fat_i_pos_read to fat.h
Move fat_i_pos_read to fat.h so that it can be called from nfs.c in the subsequent patches to encode the file handle. 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>
Showing 2 changed files with 14 additions and 14 deletions Side-by-side Diff
fs/fat/fat.h
... | ... | @@ -218,6 +218,20 @@ |
218 | 218 | + sbi->data_start; |
219 | 219 | } |
220 | 220 | |
221 | +static inline loff_t fat_i_pos_read(struct msdos_sb_info *sbi, | |
222 | + struct inode *inode) | |
223 | +{ | |
224 | + loff_t i_pos; | |
225 | +#if BITS_PER_LONG == 32 | |
226 | + spin_lock(&sbi->inode_hash_lock); | |
227 | +#endif | |
228 | + i_pos = MSDOS_I(inode)->i_pos; | |
229 | +#if BITS_PER_LONG == 32 | |
230 | + spin_unlock(&sbi->inode_hash_lock); | |
231 | +#endif | |
232 | + return i_pos; | |
233 | +} | |
234 | + | |
221 | 235 | static inline void fat16_towchar(wchar_t *dst, const __u8 *src, size_t len) |
222 | 236 | { |
223 | 237 | #ifdef __BIG_ENDIAN |
fs/fat/inode.c
... | ... | @@ -655,20 +655,6 @@ |
655 | 655 | return 0; |
656 | 656 | } |
657 | 657 | |
658 | -static inline loff_t fat_i_pos_read(struct msdos_sb_info *sbi, | |
659 | - struct inode *inode) | |
660 | -{ | |
661 | - loff_t i_pos; | |
662 | -#if BITS_PER_LONG == 32 | |
663 | - spin_lock(&sbi->inode_hash_lock); | |
664 | -#endif | |
665 | - i_pos = MSDOS_I(inode)->i_pos; | |
666 | -#if BITS_PER_LONG == 32 | |
667 | - spin_unlock(&sbi->inode_hash_lock); | |
668 | -#endif | |
669 | - return i_pos; | |
670 | -} | |
671 | - | |
672 | 658 | static int __fat_write_inode(struct inode *inode, int wait) |
673 | 659 | { |
674 | 660 | struct super_block *sb = inode->i_sb; |