[XFS] Put the correct offset in dirent d_off

The recent filldir regression fix was not putting the correct d_off in
each dirent. This was resulting in incorrect cookies being passed to dmapi
ioctls and the wrong offset appearing in the dirents. readdir was
unaffected as the filp->f_pos was being updated with the correct offset
and this was being written into the last dirent in each buffer. Fix the
XFS code to do the right thing.

SGI-PV: 973746
SGI-Modid: xfs-linux-melb:xfs-kern:30240a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
index 182c70315ad1..919d275a1cef 100644
--- a/fs/xfs/xfs_dir2_sf.c
+++ b/fs/xfs/xfs_dir2_sf.c
@@ -752,7 +752,7 @@ xfs_dir2_sf_getdents(
 #if XFS_BIG_INUMS
                 ino += mp->m_inoadd;
 #endif
-                if (filldir(dirent, ".", 1, dotdot_offset, ino, DT_DIR)) {
+                if (filldir(dirent, ".", 1, dot_offset, ino, DT_DIR)) {
                         *offset = dot_offset;
                         return 0;
                 }
@@ -762,13 +762,11 @@ xfs_dir2_sf_getdents(
          * Put .. entry unless we're starting past it.
          */
         if (*offset <= dotdot_offset) {
-                off = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk,
-                                                  XFS_DIR2_DATA_FIRST_OFFSET);
                 ino = xfs_dir2_sf_get_inumber(sfp, &sfp->hdr.parent);
 #if XFS_BIG_INUMS
                 ino += mp->m_inoadd;
 #endif
-                if (filldir(dirent, "..", 2, off, ino, DT_DIR)) {
+                if (filldir(dirent, "..", 2, dotdot_offset, ino, DT_DIR)) {
                         *offset = dotdot_offset;
                         return 0;
                 }
@@ -793,8 +791,7 @@ xfs_dir2_sf_getdents(
 #endif
 
                 if (filldir(dirent, sfep->name, sfep->namelen,
-                            off + xfs_dir2_data_entsize(sfep->namelen),
-                            ino, DT_UNKNOWN)) {
+                                            off, ino, DT_UNKNOWN)) {
                         *offset = off;
                         return 0;
                 }