dep.go    |  2 +-
 depfix.go |  2 +-
 inode.go  | 38 +++++++++++++++++++++++++++-----------
 ood.go    | 13 ++++++-------
 run.go    | 18 ++++--------------

diff --git a/dep.go b/dep.go
index df859a2bb0c0d2a60ad1fcbb7ded8ca26fe6b62c75a8c0acff8ffa59c63dc29f..3540f94f7ea427f1e7352014796fcdbdb6f57da891925e2a465f6a5d62144967 100644
--- a/dep.go
+++ b/dep.go
@@ -100,7 +100,7 @@ 	}
 	if fi.IsDir() {
 		return nil
 	}
-	inode, err := inodeFromFile(fd)
+	inode, err := inodeFromFileByFd(fd)
 	if err != nil {
 		return err
 	}
diff --git a/depfix.go b/depfix.go
index eeebdf89a9179dad103406e3c5921b77588d58b59a49887dba6c37a1e7ec5562..01b738c2fddde0915652fb80dec83328529e599a93f4220aa42784560da7314a 100644
--- a/depfix.go
+++ b/depfix.go
@@ -121,7 +121,7 @@ 						continue
 					}
 					return err
 				}
-				inode, err := inodeFromFile(fd)
+				inode, err := inodeFromFileByFd(fd)
 				if err != nil {
 					fd.Close()
 					return err
diff --git a/inode.go b/inode.go
index baa4199ddd3448ce721ac28252c5aa4fcf300e5d5208f2ce59d5664e1a9e91a1..e619cf0d0512b177d7910fd55c2a532965b4cb3edecdf615189147d4adfc3895 100644
--- a/inode.go
+++ b/inode.go
@@ -84,8 +84,19 @@ 		{Name: "MtimeNsec", Value: strconv.FormatInt(inode.MtimeNsec, 10)},
 	}
 }
 
-func inodeFromFile(fd *os.File) (*Inode, error) {
-	var fi os.FileInfo
+func inodeFromFileStat(fi os.FileInfo, stat unix.Stat_t) *Inode {
+	ctimeSec, ctimeNsec := stat.Ctim.Unix()
+	mtimeSec := fi.ModTime().Unix()
+	mtimeNsec := fi.ModTime().UnixNano()
+	return &Inode{
+		Size:     fi.Size(),
+		InodeNum: uint64(stat.Ino),
+		CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
+		MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
+	}
+}
+
+func inodeFromFileByFd(fd *os.File) (*Inode, error) {
 	fi, err := fd.Stat()
 	if err != nil {
 		return nil, err
@@ -95,15 +106,20 @@ 	err = unix.Fstat(int(fd.Fd()), &stat)
 	if err != nil {
 		return nil, err
 	}
-	ctimeSec, ctimeNsec := stat.Ctim.Unix()
-	mtimeSec := fi.ModTime().Unix()
-	mtimeNsec := fi.ModTime().UnixNano()
-	return &Inode{
-		Size:     fi.Size(),
-		InodeNum: uint64(stat.Ino),
-		CtimeSec: ctimeSec, CtimeNsec: ctimeNsec,
-		MtimeSec: mtimeSec, MtimeNsec: mtimeNsec,
-	}, nil
+	return inodeFromFileStat(fi, stat), nil
+}
+
+func inodeFromFileByPath(p string) (*Inode, error) {
+	fi, err := os.Stat(p)
+	if err != nil {
+		return nil, err
+	}
+	var stat unix.Stat_t
+	err = unix.Stat(p, &stat)
+	if err != nil {
+		return nil, err
+	}
+	return inodeFromFileStat(fi, stat), nil
 }
 
 func inodeFromRec(m map[string]string) (*Inode, error) {
diff --git a/ood.go b/ood.go
index 82102533291d37a5fe093d5ef5995255711c58e911b829246edfd27821628fc3..5e48b5704c234950aa0594acf917573e56cb32f8a82d60586631bf43fbab723c 100644
--- a/ood.go
+++ b/ood.go
@@ -153,7 +153,7 @@ 		}
 		theirHsh := m["Hash"]
 		tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep)
 
-		fd, err := os.Open(path.Join(cwd, dep))
+		inode, err := inodeFromFileByPath(path.Join(cwd, dep))
 		if err != nil {
 			if os.IsNotExist(err) {
 				tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
@@ -162,12 +162,7 @@ 				goto Done
 			}
 			return ood, TgtError{tgtOrig, err}
 		}
-		defer fd.Close()
 
-		inode, err := inodeFromFile(fd)
-		if err != nil {
-			return ood, TgtError{tgtOrig, err}
-		}
 		if inode.Size != theirInode.Size {
 			tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep)
 			ood = true
@@ -177,7 +172,12 @@ 		if InodeTrust != InodeTrustNone && inode.Equals(theirInode) {
 			tracef(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep)
 		} else {
 			tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)
+			fd, err := os.Open(path.Join(cwd, dep))
+			if err != nil {
+				return ood, TgtError{tgtOrig, err}
+			}
 			hsh, err := fileHash(fd)
+			fd.Close()
 			if err != nil {
 				return ood, TgtError{tgtOrig, err}
 			}
@@ -188,7 +188,6 @@ 				goto Done
 			}
 			tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep)
 		}
-		fd.Close()
 
 		if dep == tgt {
 			tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep)
diff --git a/run.go b/run.go
index 4e54635ffa1e56228afa7075ab9dd2556938dc3d89d624e940152fcf2f109a19..074fd53c56f1158ad921bf3ebd21fd528aa0e367815a74abf1bf1e99ceb01df2 100644
--- a/run.go
+++ b/run.go
@@ -156,16 +156,11 @@ 		}
 		if m["Type"] != DepTypeIfchange || m["Target"] != tgt {
 			continue
 		}
-		fd, err := os.Open(path.Join(cwd, tgt))
+		ourInode, err = inodeFromFileByPath(path.Join(cwd, tgt))
 		if err != nil {
 			if os.IsNotExist(err) {
 				return false, nil, "", nil
 			}
-			return false, nil, "", err
-		}
-		ourInode, err = inodeFromFile(fd)
-		fd.Close()
-		if err != nil {
 			return false, nil, "", err
 		}
 		theirInode, err := inodeFromRec(m)
@@ -655,15 +650,12 @@ 			return
 		}
 
 		// Was $1 touched?
-		if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+		if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil {
 			if inodePrev == nil {
-				fd.Close()
 				runErr.Err = Err1WasTouched
 				errs <- runErr
 				return
 			}
-			inode, err := inodeFromFile(fd)
-			fd.Close()
 			if err != nil {
 				runErr.Err = err
 				errs <- runErr
@@ -677,10 +669,8 @@ 			}
 		}
 
 		if inodePrev != nil {
-			if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
-				inode, err := inodeFromFile(fd)
-				fd.Close()
-				if err == nil && !inode.Equals(inodePrev) {
+			if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil {
+				if !inode.Equals(inodePrev) {
 					runErr.Err = Err1WasTouched
 					errs <- runErr
 					return