X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=linux-2.6-590-dcookies-mm.patch;h=89d0b17642e4dd62da9950fe7606ed60815f191d;hb=refs%2Fheads%2F27;hp=67310c1e3f9159b485705aa2ad905f0086dd72e9;hpb=4c03048da02f897dec14eeafb85fa447798ab128;p=linux-2.6.git

diff --git a/linux-2.6-590-dcookies-mm.patch b/linux-2.6-590-dcookies-mm.patch
index 67310c1e3..89d0b1764 100644
--- a/linux-2.6-590-dcookies-mm.patch
+++ b/linux-2.6-590-dcookies-mm.patch
@@ -239,80 +239,8 @@ diff -Nurb linux-2.6.27-580/include/linux/dcookies.h linux-2.6.27-590/include/li
 + * Returns 0 on success
 + */
 +
-+int dcookie_garbage_colect(void);
++int dcookie_garbage_collect(void);
 +
  #else
  
  static inline struct dcookie_user * dcookie_register(void)
-diff -Nurb linux-2.6.27-580/include/linux/dcookies.h.orig linux-2.6.27-590/include/linux/dcookies.h.orig
---- linux-2.6.27-580/include/linux/dcookies.h.orig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.27-590/include/linux/dcookies.h.orig	2008-10-09 18:13:53.000000000 -0400
-@@ -0,0 +1,68 @@
-+/*
-+ * dcookies.h
-+ *
-+ * Persistent cookie-path mappings
-+ *
-+ * Copyright 2002 John Levon <levon@movementarian.org>
-+ */
-+
-+#ifndef DCOOKIES_H
-+#define DCOOKIES_H
-+ 
-+
-+#ifdef CONFIG_PROFILING
-+ 
-+#include <linux/dcache.h>
-+#include <linux/path.h>
-+#include <linux/types.h>
-+ 
-+struct dcookie_user;
-+ 
-+/**
-+ * dcookie_register - register a user of dcookies
-+ *
-+ * Register as a dcookie user. Returns %NULL on failure.
-+ */
-+struct dcookie_user * dcookie_register(void);
-+
-+/**
-+ * dcookie_unregister - unregister a user of dcookies
-+ *
-+ * Unregister as a dcookie user. This may invalidate
-+ * any dcookie values returned from get_dcookie().
-+ */
-+void dcookie_unregister(struct dcookie_user * user);
-+  
-+/**
-+ * get_dcookie - acquire a dcookie
-+ *
-+ * Convert the given dentry/vfsmount pair into
-+ * a cookie value.
-+ *
-+ * Returns -EINVAL if no living task has registered as a
-+ * dcookie user.
-+ *
-+ * Returns 0 on success, with *cookie filled in
-+ */
-+int get_dcookie(struct path *path, unsigned long *cookie);
-+
-+#else
-+
-+static inline struct dcookie_user * dcookie_register(void)
-+{
-+	return NULL;
-+}
-+
-+static inline void dcookie_unregister(struct dcookie_user * user)
-+{
-+	return;
-+}
-+
-+static inline int get_dcookie(struct path *path, unsigned long *cookie)
-+{
-+	return -ENOSYS;
-+}
-+
-+#endif /* CONFIG_PROFILING */
-+
-+#endif /* DCOOKIES_H */