fat: accessors for msdos_dir_entry 'start' fields

Simplify code by providing accessor functions for the directory entry
start cluster fields.

Signed-off-by: Steven J. Magnani <steve@digidescorp.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>

1 files changed, 3 insertions, 9 deletions

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 0038b32cb362..05e897fe9866 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -369,10 +369,7 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
                 inode->i_op = sbi->dir_ops;
                 inode->i_fop = &fat_dir_operations;
 
-                MSDOS_I(inode)->i_start = le16_to_cpu(de->start);
-                if (sbi->fat_bits == 32)
-                        MSDOS_I(inode)->i_start |= (le16_to_cpu(de->starthi) << 16);
-
+                MSDOS_I(inode)->i_start = fat_get_start(sbi, de);
                 MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start;
                 error = fat_calc_dir_size(inode);
                 if (error < 0)
@@ -385,9 +382,7 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
                 inode->i_mode = fat_make_mode(sbi, de->attr,
                         ((sbi->options.showexec && !is_exec(de->name + 8))
                          ? S_IRUGO|S_IWUGO : S_IRWXUGO));
-                MSDOS_I(inode)->i_start = le16_to_cpu(de->start);
-                if (sbi->fat_bits == 32)
-                        MSDOS_I(inode)->i_start |= (le16_to_cpu(de->starthi) << 16);
+                MSDOS_I(inode)->i_start = fat_get_start(sbi, de);
 
                 MSDOS_I(inode)->i_logstart = MSDOS_I(inode)->i_start;
                 inode->i_size = le32_to_cpu(de->size);
@@ -613,8 +608,7 @@ retry:
         else
                 raw_entry->size = cpu_to_le32(inode->i_size);
         raw_entry->attr = fat_make_attrs(inode);
-        raw_entry->start = cpu_to_le16(MSDOS_I(inode)->i_logstart);
-        raw_entry->starthi = cpu_to_le16(MSDOS_I(inode)->i_logstart >> 16);
+        fat_set_start(raw_entry, MSDOS_I(inode)->i_logstart);
         fat_time_unix2fat(sbi, &inode->i_mtime, &raw_entry->time,
                           &raw_entry->date, NULL);
         if (sbi->options.isvfat) {