[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-84-g79c299f

[Volker Lendecke]

The branch, master has been updated
       via  79c299f96fe1780c0ca09d2ed429a2640ec56744 (commit)
       via  0fb027565780eb225806893c8292bf9c2301fc1e (commit)
      from  a702dea5a86f22e0b7857b67447152a06b3bbea2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 79c299f96fe1780c0ca09d2ed429a2640ec56744
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 27 12:20:18 2009 +0200

    Stop listening for inotify data when there's none
    
    There have been some reports that we're flooding syslog with "No data on
    inotify fd?!". I haven't been able to reproduce this yet. Until then, it is
    better to just list this message once.

commit 0fb027565780eb225806893c8292bf9c2301fc1e
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 27 11:31:53 2009 +0200

    Fix some nonempty blank lines

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/notify_inotify.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index 8237e4a..26570a2 100644
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -2,17 +2,17 @@
    Unix SMB/CIFS implementation.
 
    Copyright (C) Andrew Tridgell 2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -142,12 +142,12 @@ static bool filter_match(struct inotify_watch_context *w,
 
 	return True;
 }
-	
+
 
 
 /*
   dispatch one inotify event
-  
+
   the cookies are used to correctly handle renames
 */
 static void inotify_dispatch(struct inotify_private *in, 
@@ -211,7 +211,7 @@ static void inotify_dispatch(struct inotify_private *in,
 
 	ne.action = NOTIFY_ACTION_MODIFIED;
 	e->mask = IN_ATTRIB;
-	
+
 	for (w=in->watches;w;w=next) {
 		next = w->next;
 		if (w->wd == e->wd && filter_match(w, e) &&
@@ -241,6 +241,7 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde,
 	if (ioctl(in->fd, FIONREAD, &bufsize) != 0 || 
 	    bufsize == 0) {
 		DEBUG(0,("No data on inotify fd?!\n"));
+		TALLOC_FREE(fde);
 		return;
 	}
 
@@ -296,7 +297,7 @@ static NTSTATUS inotify_setup(struct sys_notify_context *ctx)
 
 	/* add a event waiting for the inotify fd to be readable */
 	event_add_fd(ctx->ev, in, in->fd, EVENT_FD_READ, inotify_handler, in);
-	
+
 	return NT_STATUS_OK;
 }
 
@@ -350,7 +351,7 @@ static int watch_destructor(struct inotify_watch_context *w)
 			DEBUG(1, ("inotify_rm_watch returned %s\n",
 				  strerror(errno)));
 		}
-		
+
 	}
 	return 0;
 }
@@ -431,7 +432,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
 
 	/* the caller frees the handle to stop watching */
 	talloc_set_destructor(w, watch_destructor);
-	
+
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository