[tracker] Removed NFS lock code since



commit 975f68016e51cb9a2b47e399bf546c27de1fb05a
Author: Martyn Russell <martyn imendio com>
Date:   Fri Jul 10 11:38:30 2009 +0100

    Removed NFS lock code since
    
    This was mostly unused and turned off in the config by default anyway.
    With the new architecture changes, this shouldn't be necessary.

 src/libtracker-common/Makefile.am          |    2 -
 src/libtracker-common/tracker-nfs-lock.c   |  197 ----------------------------
 src/libtracker-common/tracker-nfs-lock.h   |   40 ------
 src/libtracker-data/tracker-data-manager.c |    1 -
 src/libtracker-data/tracker-data-query.c   |    1 -
 src/libtracker-db/tracker-db-manager.c     |    5 -
 src/tracker-store/tracker-main.c           |    4 -
 7 files changed, 0 insertions(+), 250 deletions(-)
---
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 521ec20..984a604 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -67,7 +67,6 @@ libtracker_common_la_SOURCES =	 			\
 	tracker-marshal-main.c				\
 	tracker-module-config.c				\
 	tracker-namespace.c				\
-	tracker-nfs-lock.c				\
 	tracker-ontology.c				\
 	tracker-parser.c				\
 	tracker-property.c				\
@@ -86,7 +85,6 @@ noinst_HEADERS =					\
 	tracker-dbus.h					\
 	tracker-ioprio.h				\
 	tracker-log.h					\
-	tracker-nfs-lock.h				\
 	tracker-os-dependant.h				\
 	tracker-thumbnailer.h				\
 	tracker-albumart.h
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index d05ba2d..89089e0 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -31,7 +31,6 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-nfs-lock.h>
 #include <libtracker-common/tracker-parser.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index 9819e61..8adcc78 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 
 #include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-nfs-lock.h>
 #include <libtracker-common/tracker-parser.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c
index 0c6bd84..edda959 100644
--- a/src/libtracker-db/tracker-db-manager.c
+++ b/src/libtracker-db/tracker-db-manager.c
@@ -30,7 +30,6 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-nfs-lock.h>
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-property.h>
 #include <libtracker-common/tracker-type-utils.h>
@@ -237,8 +236,6 @@ db_exec_no_reply (TrackerDBInterface *iface,
 	TrackerDBResultSet *result_set;
 	va_list		    args;
 
-	tracker_nfs_lock_obtain ();
-
 	va_start (args, query);
 	result_set = tracker_db_interface_execute_vquery (iface, NULL, query, args);
 	va_end (args);
@@ -247,8 +244,6 @@ db_exec_no_reply (TrackerDBInterface *iface,
 		g_object_unref (result_set);
 	}
 
-	tracker_nfs_lock_release ();
-
 	return TRUE;
 }
 
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 1756070..1b09828 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -50,7 +50,6 @@
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-module-config.h>
-#include <libtracker-common/tracker-nfs-lock.h>
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-status.h>
 #include <libtracker-common/tracker-thumbnailer.h>
@@ -976,8 +975,6 @@ main (gint argc, gchar *argv[])
 
 	sanity_check_option_values (config);
 
-	tracker_nfs_lock_init (tracker_config_get_nfs_locking (config));
-
 #ifdef HAVE_HAL
 	hal_power = tracker_power_new ();
 	hal_storage = tracker_storage_new ();
@@ -1096,7 +1093,6 @@ shutdown:
 	tracker_volume_cleanup_shutdown ();
 	tracker_dbus_shutdown ();
 	tracker_data_manager_shutdown ();
-	tracker_nfs_lock_shutdown ();
 	tracker_status_shutdown ();
 	tracker_turtle_shutdown ();
 	tracker_store_shutdown ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]