diff options
author | phk <phk@FreeBSD.org> | 2004-09-24 06:37:00 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-09-24 06:37:00 +0000 |
commit | 1a87f07f3cae75c1569eb44ace4dd0ab93112e5c (patch) | |
tree | a81e106b4ec1167964de9c6cc3969fa66dccdf87 /sys/compat | |
parent | 650224c28704bbb05304573986a08bb3a57d2172 (diff) | |
download | FreeBSD-src-1a87f07f3cae75c1569eb44ace4dd0ab93112e5c.zip FreeBSD-src-1a87f07f3cae75c1569eb44ace4dd0ab93112e5c.tar.gz |
Hold thread reference while frobbing cdevsw.
Diffstat (limited to 'sys/compat')
-rw-r--r-- | sys/compat/linux/linux_stats.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 406b524..213732d 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -84,15 +84,18 @@ newstat_copyout(struct stat *buf, void *ubuf) */ if (S_ISCHR(tbuf.st_mode) && (dev = findcdev(buf->st_rdev)) != NULL) { - cdevsw = devsw(dev); - if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) { - tbuf.st_mode &= ~S_IFMT; - tbuf.st_mode |= S_IFBLK; - - /* XXX this may not be quite right */ - /* Map major number to 0 */ - tbuf.st_dev = uminor(buf->st_dev) & 0xf; - tbuf.st_rdev = buf->st_rdev & 0xff; + cdevsw = dev_refthread(dev); + if (cdevsw != NULL) { + if (cdevsw->d_flags & D_DISK) { + tbuf.st_mode &= ~S_IFMT; + tbuf.st_mode |= S_IFBLK; + + /* XXX this may not be quite right */ + /* Map major number to 0 */ + tbuf.st_dev = uminor(buf->st_dev) & 0xf; + tbuf.st_rdev = buf->st_rdev & 0xff; + } + dev_relthread(dev); } } @@ -428,15 +431,18 @@ stat64_copyout(struct stat *buf, void *ubuf) */ if (S_ISCHR(lbuf.st_mode) && (dev = findcdev(buf->st_rdev)) != NULL) { - cdevsw = devsw(dev); - if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) { - lbuf.st_mode &= ~S_IFMT; - lbuf.st_mode |= S_IFBLK; - - /* XXX this may not be quite right */ - /* Map major number to 0 */ - lbuf.st_dev = uminor(buf->st_dev) & 0xf; - lbuf.st_rdev = buf->st_rdev & 0xff; + cdevsw = dev_refthread(dev); + if (cdevsw != NULL) { + if (cdevsw->d_flags & D_DISK) { + lbuf.st_mode &= ~S_IFMT; + lbuf.st_mode |= S_IFBLK; + + /* XXX this may not be quite right */ + /* Map major number to 0 */ + lbuf.st_dev = uminor(buf->st_dev) & 0xf; + lbuf.st_rdev = buf->st_rdev & 0xff; + } + dev_relthread(dev); } } |