[XFS] Initialise current offset in xfs_file_readdir correctly
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 21 Dec 2007 00:00:23 +0000 (11:00 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 21 Dec 2007 00:40:05 +0000 (11:40 +1100)
After reading the directory contents into the temporary buffer, we grab
each dirent and pass it to filldir witht eh current offset of the dirent.
The current offset was not being set for the first dirent in the temporary
buffer, which coul dresult in bad offsets being set in the f_pos field
result in looping and duplicate entries being returned from readdir.

SGI-PV: 974905
SGI-Modid: xfs-linux-melb:xfs-kern:30282a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
fs/xfs/linux-2.6/xfs_file.c

index e1fcef2eb9285a6f8f449b72deb1e925c540671d..4847eb83fc180868f9af080cf0f9a1b2696a8b19 100644 (file)
@@ -347,6 +347,7 @@ xfs_file_readdir(
 
                size = buf.used;
                de = (struct hack_dirent *)buf.dirent;
+               curr_offset = de->offset /* & 0x7fffffff */;
                while (size > 0) {
                        if (filldir(dirent, de->name, de->namlen,
                                        curr_offset & 0x7fffffff,