udf: cleanup directory offset handling

Position in directory returned by readdir is offset of directory entry divided
by four (don't ask me why).  Make this conversion only when reading f_pos from
userspace / writing it there and internally work in bytes.  It makes things
more easily readable and also fixes a bug (we forgot to divide length of the
entry by 4 when advancing f_pos in udf_add_entry()).

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index be16d7698a8c..2820f8fcf4cc 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -95,7 +95,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                 if (!fi)
                         return NULL;
 
-                *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
+                *nf_pos += fibh->eoffset - fibh->soffset;
 
                 memcpy((uint8_t *)cfi, (uint8_t *)fi,
                        sizeof(struct fileIdentDesc));
@@ -157,7 +157,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
         if (!fi)
                 return NULL;
 
-        *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
+        *nf_pos += fibh->eoffset - fibh->soffset;
 
         if (fibh->eoffset <= dir->i_sb->s_blocksize) {
                 memcpy((uint8_t *)cfi, (uint8_t *)fi,
@@ -197,8 +197,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
                                   cfi->lengthFileIdent +
                                   le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;
 
-                        *nf_pos += (fi_len - (fibh->eoffset - fibh->soffset))
-                                        >> 2;
+                        *nf_pos += fi_len - (fibh->eoffset - fibh->soffset);
                         fibh->eoffset = fibh->soffset + fi_len;
                 } else {
                         memcpy((uint8_t *)cfi, (uint8_t *)fi,