1 files changed, 2 insertions, 1 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 1df26ddf68b1..dde2d251fc3d 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -512,7 +512,8 @@ int cifs_closedir(struct inode *inode, struct file *file)
                 pTcon = cifs_sb->tcon;
 
                 cFYI(1, ("Freeing private data in close dir"));
-                if (pCFileStruct->srch_inf.endOfSearch == FALSE) {
+                if ((pCFileStruct->srch_inf.endOfSearch == FALSE) &&
+                   (pCFileStruct->invalidHandle == FALSE)) {
                         pCFileStruct->invalidHandle = TRUE;
                         rc = CIFSFindClose(xid, pTcon, pCFileStruct->netfid);
                         cFYI(1, ("Closing uncompleted readdir with rc %d",