This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] Drop useless calls to path_conv.isgood_inode
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 21 Jun 2016 11:40:05 -0000
- Subject: [newlib-cygwin] Drop useless calls to path_conv.isgood_inode
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2c832271127f2ae7eea4245dc940d8a5c1fe7498
commit 2c832271127f2ae7eea4245dc940d8a5c1fe7498
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Tue Jun 21 13:39:35 2016 +0200
Drop useless calls to path_conv.isgood_inode
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/fhandler_disk_file.cc | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index f4b5284..5148dd7 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -334,8 +334,7 @@ fhandler_base::fstat_by_handle (struct stat *buf)
return -1;
}
}
- if (pc.hasgood_inode ()
- && pc.isgood_inode (pc.fai ()->InternalInformation.IndexNumber.QuadPart))
+ if (pc.isgood_inode (pc.fai ()->InternalInformation.IndexNumber.QuadPart))
ino = pc.fai ()->InternalInformation.IndexNumber.QuadPart;
return fstat_helper (buf);
}
@@ -463,10 +462,7 @@ fhandler_base::fstat_helper (struct stat *buf)
buf->st_nlink = pc.fai()->StandardInformation.NumberOfLinks;
/* Enforce namehash as inode number on untrusted file systems. */
- if (ino && pc.isgood_inode (ino))
- buf->st_ino = (ino_t) ino;
- else
- buf->st_ino = get_ino ();
+ buf->st_ino = ino ?: get_ino ();
buf->st_blksize = PREFERRED_IO_BLKSIZE;