diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 84fbd3158..5e444b56d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2012-04-11 Corinna Vinschen <corinna@vinschen.de> + + * syscalls.cc (fhandler_base::stat_fixup): Fix inode numbers of + non-device files in virtual fileysystems. + 2012-04-07 Christopher Faylor <me.cygwin2012@cgf.cx> * dtable.cc (cygwin_attach_handle_to_fd): Defend against NULL return diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 3ea4a6f8b..9fc4a298c 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1591,10 +1591,11 @@ static bool dev_st_inited; void fhandler_base::stat_fixup (struct __stat64 *buf) { - /* Set inode number to device number. This gives us a valid, unique - inode number and we especially don't have to call hash_path_name. */ + /* For devices, set inode number to device number. This gives us a valid, + unique inode number without having to call hash_path_name. */ if (!buf->st_ino) - buf->st_ino = get_device (); + buf->st_ino = (get_major () == DEV_VIRTFS_MAJOR) ? get_ino () + : get_device (); /* For /dev-based devices, st_dev must be set to the device number of /dev, not it's own device major/minor numbers. What we do here to speed up the process is to fetch the device number of /dev only once, liberally |