From 2e402599bfb4c4e97a8f6f8b0910783c7a693aaf Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@xenon.tklauser.home>
Date: Sun, 13 Aug 2006 18:06:41 +0200
Subject: Alos check for fd when adding watch to file.

---
 inotail.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inotail.c b/inotail.c
index 8618a20..afcc1f7 100644
--- a/inotail.c
+++ b/inotail.c
@@ -199,7 +199,7 @@ static int watch_files(struct file_struct *f, int n_files)
 
 			/* Which file has produced the event? */
 			for (i = 0; i < n_files; i++) {
-				if (!f[i].ignore && f[i].i_watch == inev->wd) {
+				if (!f[i].ignore && f[i].fd >= 0 && f[i].i_watch == inev->wd) {
 					fil = &f[i];
 					break;
 				}
-- 
cgit v1.2.3-54-g00ecf

owspan='2'><a href='/cgit.cgi/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/cgit.cgi/'>index</a> : <a href='/cgit.cgi/linux/net-next.git/'>net-next.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008'/><input type='hidden' name='id2' value='4a80467a7cc0e038c241578faafbd1fee0c5b570'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/?id=691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008'>tree</a><a href='/cgit.cgi/linux/net-next.git/commit/?id=691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008'>commit</a><a class='active' href='/cgit.cgi/linux/net-next.git/diff/?id=691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008&amp;id2=4a80467a7cc0e038c241578faafbd1fee0c5b570'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/'>
<input type='hidden' name='id' value='691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008'/><input type='hidden' name='id2' value='4a80467a7cc0e038c241578faafbd1fee0c5b570'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008'/><input type='hidden' name='id2' value='4a80467a7cc0e038c241578faafbd1fee0c5b570'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008&amp;id2=4a80467a7cc0e038c241578faafbd1fee0c5b570'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/arch/arm/boot/dts/exynos3250-rinato.dts?id=691d010e5d5f9582b5976d5f8cfb9ac9ce4b5008&amp;id2=4a80467a7cc0e038c241578faafbd1fee0c5b570'>arch/arm/boot/dts/exynos3250-rinato.dts</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='41%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 41 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts