diff options
| author | Joey Hess <joeyh@joeyh.name> | 2021-06-29 13:28:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2021-06-29 13:28:25 -0400 |
| commit | 2db8167ddbfa080b44509d4532d7d34887cdc64a (patch) | |
| tree | 997c359eaac8297ac01374d96c012d64c4913407 /Utility/InodeCache.hs | |
| parent | 84db819626232d789864780a52b63a787d49ef52 (diff) | |
| download | git-repair-2db8167ddbfa080b44509d4532d7d34887cdc64a.tar.gz | |
merge from git-annex
Fixes 2 bugs, one a data loss bug. It is possible to get those fixes
without merging all the other changes, if a backport is wanted.
Diffstat (limited to 'Utility/InodeCache.hs')
| -rw-r--r-- | Utility/InodeCache.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs index 74c6dff..9a21c63 100644 --- a/Utility/InodeCache.hs +++ b/Utility/InodeCache.hs @@ -24,6 +24,7 @@ module Utility.InodeCache ( showInodeCache, genInodeCache, toInodeCache, + toInodeCache', InodeCacheKey, inodeCacheToKey, @@ -189,7 +190,10 @@ genInodeCache f delta = catchDefaultIO Nothing $ toInodeCache delta f =<< R.getFileStatus f toInodeCache :: TSDelta -> RawFilePath -> FileStatus -> IO (Maybe InodeCache) -toInodeCache (TSDelta getdelta) f s +toInodeCache d f s = toInodeCache' d f s (fileID s) + +toInodeCache' :: TSDelta -> RawFilePath -> FileStatus -> FileID -> IO (Maybe InodeCache) +toInodeCache' (TSDelta getdelta) f s inode | isRegularFile s = do delta <- getdelta sz <- getFileSize' f s @@ -198,7 +202,7 @@ toInodeCache (TSDelta getdelta) f s #else let mtime = modificationTimeHiRes s #endif - return $ Just $ InodeCache $ InodeCachePrim (fileID s) sz (MTimeHighRes (mtime + highResTime delta)) + return $ Just $ InodeCache $ InodeCachePrim inode sz (MTimeHighRes (mtime + highResTime delta)) | otherwise = pure Nothing {- Some filesystem get new random inodes each time they are mounted. |