Author: kib
Date: Wed Aug 17 07:17:16 2016
New Revision: 304266
URL: https://svnweb.freebsd.org/changeset/base/304266
Log:
MFC r303916:
Convert another tmpfs assert into runtime check.
Modified:
stable/10/sys/fs/tmpfs/tmpfs_subr.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- stable/10/sys/fs/tmpfs/tmpfs_subr.c Wed Aug 17 07:15:50 2016
(r304265)
+++ stable/10/sys/fs/tmpfs/tmpfs_subr.c Wed Aug 17 07:17:16 2016
(r304266)
@@ -818,10 +818,13 @@ tmpfs_dir_lookup_cookie(struct tmpfs_nod
goto out;
}
- MPASS((cookie & TMPFS_DIRCOOKIE_MASK) == cookie);
- dekey.td_hash = cookie;
- /* Recover if direntry for cookie was removed */
- de = RB_NFIND(tmpfs_dir, dirhead, &dekey);
+ if ((cookie & TMPFS_DIRCOOKIE_MASK) != cookie) {
+ de = NULL;
+ } else {
+ dekey.td_hash = cookie;
+ /* Recover if direntry for cookie was removed */
+ de = RB_NFIND(tmpfs_dir, dirhead, &dekey);
+ }
dc->tdc_tree = de;
dc->tdc_current = de;
if (de != NULL && tmpfs_dirent_duphead(de)) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
