[maemo-commits] [maemo-commits] r14680 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-10-31 09:57:24 +0200 (Wed, 31 Oct 2007)
New Revision: 14680

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/41-NB65193-lower-smb-timeouts.patch
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/42-NB65193-smb-rescan-when-failing.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
NB#65193 and NB#74527


Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-10-30 11:43:34 UTC (rev 14679)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-10-31 07:57:24 UTC (rev 14680)
@@ -1,3 +1,10 @@
+osso-gnome-vfs2 (2.16.3-1osso32) unstable; urgency=low
+
+  * Fixes: NB#65193, It takes about 10 minutes before Samba server is
+  * Fixes: NB#74527, Timeouts should be reduced in gnome-vfs smb module
+	
+ -- Richard Hult <richard at imendio.com>  Wed, 31 Oct 2007 08:55:132 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso31) unstable; urgency=low
 
   * Fixes: NB#71470, Crash in gnome-vfs

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/41-NB65193-lower-smb-timeouts.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/41-NB65193-lower-smb-timeouts.patch	2007-10-30 11:43:34 UTC (rev 14679)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/41-NB65193-lower-smb-timeouts.patch	2007-10-31 07:57:24 UTC (rev 14680)
@@ -0,0 +1,26 @@
+Index: modules/smb-method.c
+===================================================================
+--- modules/smb-method.c	(revision 14670)
++++ modules/smb-method.c	(working copy)
+@@ -92,8 +92,8 @@ static GHashTable *user_cache = NULL;
+ 
+ #define SMB_BLOCK_SIZE (32*1024)
+ 
+-/* Reap unused server connections and user cache after 30 minutes */
+-#define CACHE_REAP_TIMEOUT (30 * 60)
++/* Reap unused server connections and user cache after 10 minutes */
++#define CACHE_REAP_TIMEOUT (10 * 60)
+ static guint cache_reap_timeout = 0;
+ 
+ /* We load a default workgroup from gconf */
+@@ -105,8 +105,8 @@ static guint cache_reap_timeout = 0;
+ /* Guest logins use: */
+ #define GUEST_LOGIN "guest"
+ 
+-/* 5 minutes before we re-read the workgroup cache again */
+-#define WORKGROUP_CACHE_TIMEOUT (5*60)
++/* 1 minute before we re-read the workgroup cache again */
++#define WORKGROUP_CACHE_TIMEOUT (1*60)
+ 
+ static GHashTable *workgroups = NULL;
+ static time_t workgroups_timestamp = 0;

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/42-NB65193-smb-rescan-when-failing.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/42-NB65193-smb-rescan-when-failing.patch	2007-10-30 11:43:34 UTC (rev 14679)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/42-NB65193-smb-rescan-when-failing.patch	2007-10-31 07:57:24 UTC (rev 14680)
@@ -0,0 +1,21 @@
+Index: modules/smb-method.c
+===================================================================
+--- modules/smb-method.c	(revision 14679)
++++ modules/smb-method.c	(working copy)
+@@ -528,7 +528,6 @@ update_workgroup_cache (void)
+ 		/* Up to date */
+ 		return;
+ 	}
+-	workgroups_timestamp = t;
+ 
+ 	DEBUG_SMB(("update_workgroup_cache: enumerating workgroups\n"));
+ 	
+@@ -545,6 +544,8 @@ update_workgroup_cache (void)
+ 	}
+ 
+ 	if (dir != NULL) {
++		workgroups_timestamp = t;
++
+ 		while ((dirent = smb_context->readdir (smb_context, dir)) != NULL) {
+ 			if (dirent->smbc_type == SMBC_WORKGROUP &&
+ 			    dirent->name != NULL &&