Also avoid fstat()+close() on non-directoy files.
(cherry picked from commit f9812a51e64e0777fa847fdf51f00fb500d2e1ca)

Conflicts:
	modules/access/directory.c