diff options
| author | pjd <pjd@FreeBSD.org> | 2007-05-23 21:27:47 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2007-05-23 21:27:47 +0000 |
| commit | 6c58fb817ad1d15593a833fbe12e8dc78d4c5cc8 (patch) | |
| tree | f1e9169168030743548a92d0bf7784f8d2962d8b | |
| parent | 8625243fb9368e0c1844272aa555642be08ca1c3 (diff) | |
| download | FreeBSD-src-6c58fb817ad1d15593a833fbe12e8dc78d4c5cc8.zip FreeBSD-src-6c58fb817ad1d15593a833fbe12e8dc78d4c5cc8.tar.gz | |
All objects we create using GFS are directories, so initialize d_type
properly, but add XXX comment saying that it can eventually change in
the future.
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c | 4 | ||||
| -rw-r--r-- | sys/contrib/opensolaris/uts/common/fs/gfs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c b/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c index 51158c6..528b4b2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c @@ -195,9 +195,10 @@ gfs_readdir_emit_int(gfs_readdir_state_t *st, uio_t *uiop, offset_t next, return (-1); } + /* XXX: This can change in the future. */ + st->grd_dirent->d_type = DT_DIR; st->grd_dirent->d_reclen = (ushort_t)reclen; st->grd_dirent->d_namlen = namlen; - /* TODO: d_type */ if (uiomove((caddr_t)st->grd_dirent, reclen, UIO_READ, uiop)) return (EFAULT); @@ -232,7 +233,6 @@ gfs_readdir_emit(gfs_readdir_state_t *st, uio_t *uiop, offset_t voff, st->grd_dirent->d_ino = ino; (void) strncpy(st->grd_dirent->d_name, name, st->grd_namlen); - /* TODO: d_type */ /* * Inter-entry offsets are invalid, so we assume a record size of diff --git a/sys/contrib/opensolaris/uts/common/fs/gfs.c b/sys/contrib/opensolaris/uts/common/fs/gfs.c index 51158c6..528b4b2 100644 --- a/sys/contrib/opensolaris/uts/common/fs/gfs.c +++ b/sys/contrib/opensolaris/uts/common/fs/gfs.c @@ -195,9 +195,10 @@ gfs_readdir_emit_int(gfs_readdir_state_t *st, uio_t *uiop, offset_t next, return (-1); } + /* XXX: This can change in the future. */ + st->grd_dirent->d_type = DT_DIR; st->grd_dirent->d_reclen = (ushort_t)reclen; st->grd_dirent->d_namlen = namlen; - /* TODO: d_type */ if (uiomove((caddr_t)st->grd_dirent, reclen, UIO_READ, uiop)) return (EFAULT); @@ -232,7 +233,6 @@ gfs_readdir_emit(gfs_readdir_state_t *st, uio_t *uiop, offset_t voff, st->grd_dirent->d_ino = ino; (void) strncpy(st->grd_dirent->d_name, name, st->grd_namlen); - /* TODO: d_type */ /* * Inter-entry offsets are invalid, so we assume a record size of |
