From 5e05f22798cce04ab1c76f979eeeb578f1e72f97 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 21 Dec 2012 12:30:24 -0600 Subject: [PATCH] ihandle: Add FDH_ISUNLINKED Add the FDH_ISUNLINKED functionality to ihandle. This lets the caller know if the file for the underlying file descriptor has been deleted out from under us. This is useful for sanity checks in some callers. Reviewed-on: http://gerrit.openafs.org/8838 Reviewed-by: Chas Williams - CONTRACTOR Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 9cf9a0e978ece2b0afb8ba5947455f307a424cab) Change-Id: If5cde825a2e7413c47409c69f15507d6df1934c3 Reviewed-on: http://gerrit.openafs.org/9507 Reviewed-by: Derrick Brashear Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand Tested-by: BuildBot --- src/vol/ihandle.c | 15 +++++++++++++++ src/vol/ihandle.h | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/src/vol/ihandle.c b/src/vol/ihandle.c index e9cb7a8fad..4ae1441a70 100644 --- a/src/vol/ihandle.c +++ b/src/vol/ihandle.c @@ -1089,3 +1089,18 @@ ih_pwrite(int fd, const void * buf, size_t count, afs_foff_t offset) return OS_WRITE(fd, buf, count); } #endif /* !HAVE_PIO */ + +#ifndef AFS_NT40_ENV +int +ih_isunlinked(int fd) +{ + struct afs_stat status; + if (afs_fstat(fd, &status) < 0) { + return -1; + } + if (status.st_nlink < 1) { + return 1; + } + return 0; +} +#endif /* !AFS_NT40_ENV */ diff --git a/src/vol/ihandle.h b/src/vol/ihandle.h index ba4a831177..cb6adcf37c 100644 --- a/src/vol/ihandle.h +++ b/src/vol/ihandle.h @@ -61,6 +61,7 @@ * status information: * FDH_SIZE - returns the size of the file. * FDH_NLINK - returns the link count of the file. + * FDH_ISUNLINKED - returns if the file has been unlinked out from under us * * Miscellaneous: * FDH_FDOPEN - create a descriptor for buffered I/O @@ -386,6 +387,8 @@ extern ssize_t ih_pwrite(int fd, const void * buf, size_t count, afs_foff_t offs # define OS_UNLOCKFILE(FD, O) (!UnlockFile(FD, (DWORD)((O) & 0xFFFFFFFF), (DWORD)((O) >> 32), 2, 0)) # define OS_ERROR(X) nterr_nt2unix(GetLastError(), X) # define OS_UNLINK(X) nt_unlink(X) +/* we can't have a file unlinked out from under us on NT */ +# define OS_ISUNLINKED(X) (0) # define OS_DIRSEP "\\" # define OS_DIRSEPC '\\' #else @@ -393,6 +396,8 @@ extern ssize_t ih_pwrite(int fd, const void * buf, size_t count, afs_foff_t offs # define OS_UNLOCKFILE(FD, O) flock(FD, LOCK_UN) # define OS_ERROR(X) X # define OS_UNLINK(X) unlink(X) +# define OS_ISUNLINKED(X) ih_isunlinked(X) +extern int ih_isunlinked(FD_t fd); # define OS_DIRSEP "/" # define OS_DIRSEPC '/' #endif @@ -550,5 +555,6 @@ extern afs_sfsize_t ih_size(FD_t); #define FDH_SIZE(H) OS_SIZE((H)->fd_fd) #define FDH_LOCKFILE(H, O) OS_LOCKFILE((H)->fd_fd, O) #define FDH_UNLOCKFILE(H, O) OS_UNLOCKFILE((H)->fd_fd, O) +#define FDH_ISUNLINKED(H) OS_ISUNLINKED((H)->fd_fd) #endif /* _IHANDLE_H_ */