storage/FileInfo, db/simple/Directory: use 64 bit for device/inode

An ino_t is usually a 64 bit integer, and some file systems (such as Linux's kernel NFS client) really uses the upper 32 bit. This can lead to false positives in the directory loop detection in FindAncestorLoop(). Increasing these two attributes (in StorageFileInfo and Directory) to 64 bit adds little overhead, but makes the check a lot safer.

storage/FileInfo, db/simple/Directory: use 64 bit for device/inode
504f5f7b · Max Kellermann · 32bcad51 · 504f5f7b · 504f5f7b · 504f5f7b
Commit 504f5f7b authored Apr 06, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NEWS NEWS +2 -0

Directory.hxx src/db/plugins/simple/Directory.hxx +1 -1

FileInfo.hxx src/storage/FileInfo.hxx +1 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.7 (not yet released)
+* database
+  - simple: fix false positive directory loop detection with NFS

 ver 0.20.6 (2017/03/10)
 * input

--- a/src/db/plugins/simple/Directory.hxx
+++ b/src/db/plugins/simple/Directory.hxx
@@ -86,7 +86,7 @@ struct Directory {

 	Directory *parent;
 	time_t mtime;
-	unsigned inode, device;
+	uint64_t inode, device;

 	std::string path;


--- a/src/storage/FileInfo.hxx
+++ b/src/storage/FileInfo.hxx
@@ -48,7 +48,7 @@ struct StorageFileInfo {
 	 * Device id and inode number.  0 means unknown / not
 	 * applicable.
 	 */
-	unsigned device, inode;
+	uint64_t device, inode;

 	constexpr bool IsRegular() const {
 		return type == Type::REGULAR;