diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /ipc | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -438,12 +438,12 @@ static int shm_readdir (struct file *filp, void *dirent, filldir_t filldir) switch(nr) { case 0: - if (filldir(dirent, ".", 1, nr, inode->i_ino) < 0) + if (filldir(dirent, ".", 1, nr, inode->i_ino, DT_DIR) < 0) return 0; filp->f_pos = ++nr; /* fall through */ case 1: - if (filldir(dirent, "..", 2, nr, inode->i_ino) < 0) + if (filldir(dirent, "..", 2, nr, inode->i_ino, DT_DIR) < 0) return 0; filp->f_pos = ++nr; /* fall through */ @@ -456,7 +456,7 @@ static int shm_readdir (struct file *filp, void *dirent, filldir_t filldir) continue; if (shp->shm_flags & SHM_UNLK) continue; - if (filldir(dirent, shp->shm_name, shp->shm_namelen, nr, nr) < 0 ) + if (filldir(dirent, shp->shm_name, shp->shm_namelen, nr, nr, DT_REG) < 0 ) break;; } filp->f_pos = nr; |