---

yaml
---
r: 130469
b: refs/heads/master
c: 42c2454
h: refs/heads/master
i:
  130467: b928c99
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a7f8d36c00ab7adef5fb633f7805c91e8c1e139
+refs/heads/master: 42c245447c8c3f998dfe880aba18b6e5129d2976

trunk/fs/cifs/CHANGES

@@ -5,7 +5,9 @@ rather than posix (advisory) byte range locks, even though server would
 support posix byte range locks.  Fix query of root inode when prefixpath
 specified and user does not have access to query information about the
 top of the share.  Fix problem in 2.6.28 resolving DFS paths to
-Samba servers (worked to Windows).
+Samba servers (worked to Windows).  Fix rmdir so that pending search
+(readdir) requests do not get invalid results which include the now
+removed directory.
 
 Version 1.55
 ------------

trunk/fs/cifs/inode.c

@@ -1285,6 +1285,11 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
 	cifsInode = CIFS_I(direntry->d_inode);
 	cifsInode->time = 0;	/* force revalidate to go get info when
 				   needed */
+
+	cifsInode = CIFS_I(inode);
+	cifsInode->time = 0;	/* force revalidate to get parent dir info
+				   since cached search results now invalid */
+
 	direntry->d_inode->i_ctime = inode->i_ctime = inode->i_mtime =
 		current_fs_time(inode->i_sb);