From: S.Çağlar Onur Date: Fri, 19 Feb 2010 04:23:35 +0000 (+0000) Subject: remove the *.orig part from patch as it's not needed X-Git-Tag: linux-2.6-27-7~5 X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=1d92d2ade7554069a95efb4d59324147be8ee85a remove the *.orig part from patch as it's not needed --- diff --git a/linux-2.6-590-dcookies-mm.patch b/linux-2.6-590-dcookies-mm.patch index 67310c1e3..9ea522901 100644 --- a/linux-2.6-590-dcookies-mm.patch +++ b/linux-2.6-590-dcookies-mm.patch @@ -244,75 +244,3 @@ diff -Nurb linux-2.6.27-580/include/linux/dcookies.h linux-2.6.27-590/include/li #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 -+ */ -+ -+#ifndef DCOOKIES_H -+#define DCOOKIES_H -+ -+ -+#ifdef CONFIG_PROFILING -+ -+#include -+#include -+#include -+ -+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 */