aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-11-17 15:58:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-11-17 15:58:58 +0000
commit3f27bdd7daa72f700d6692f3f3ecef3706e5ebfa (patch)
treeae2a8cca1ca102d5dcf859a435e7a20440966431 /target/linux/generic-2.6
parent5790d3c9d8a6440c1301fc011151273b652fe72e (diff)
downloadupstream-3f27bdd7daa72f700d6692f3f3ecef3706e5ebfa.tar.gz
upstream-3f27bdd7daa72f700d6692f3f3ecef3706e5ebfa.tar.bz2
upstream-3f27bdd7daa72f700d6692f3f3ecef3706e5ebfa.zip
mini_fo fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5556 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches/209-mini_fo.patch36
1 files changed, 2 insertions, 34 deletions
diff --git a/target/linux/generic-2.6/patches/209-mini_fo.patch b/target/linux/generic-2.6/patches/209-mini_fo.patch
index f8a1a9ddba..8fbc3aadd0 100644
--- a/target/linux/generic-2.6/patches/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches/209-mini_fo.patch
@@ -1142,7 +1142,7 @@ diff -urN linux.old/fs/mini_fo/dentry.c linux.dev/fs/mini_fo/dentry.c
diff -urN linux.old/fs/mini_fo/file.c linux.dev/fs/mini_fo/file.c
--- linux.old/fs/mini_fo/file.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/fs/mini_fo/file.c 2006-11-17 03:11:48.000000000 +0100
-@@ -0,0 +1,717 @@
+@@ -0,0 +1,690 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University
@@ -1792,33 +1792,6 @@ diff -urN linux.old/fs/mini_fo/file.c linux.dev/fs/mini_fo/file.c
+}
+
+
-+STATIC int
-+mini_fo_lock(file_t *file, int cmd, struct file_lock *fl)
-+{
-+ int err = -EINVAL;
-+ file_t *hidden_file = NULL;
-+
-+ if(!check_mini_fo_file(file))
-+ goto out;
-+
-+ /* which file shall we lock? */
-+ if(ftohf2(file))
-+ hidden_file = ftohf2(file);
-+ else
-+ hidden_file = ftohf(file);
-+
-+ if (hidden_file->f_op->lock) {
-+ fl->fl_file = hidden_file;
-+ err = hidden_file->f_op->lock(hidden_file, F_GETLK, fl);
-+ fl->fl_file = file;
-+ } else {
-+ if(posix_test_lock(hidden_file, fl))
-+ err = 0;
-+ }
-+ out:
-+ return err;
-+}
-+
+
+struct file_operations mini_fo_dir_fops =
+ {
@@ -4110,7 +4083,7 @@ diff -urN linux.old/fs/mini_fo/main.c linux.dev/fs/mini_fo/main.c
diff -urN linux.old/fs/mini_fo/Makefile linux.dev/fs/mini_fo/Makefile
--- linux.old/fs/mini_fo/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/fs/mini_fo/Makefile 2006-11-17 03:11:48.000000000 +0100
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,17 @@
+#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
+#
@@ -4125,11 +4098,6 @@ diff -urN linux.old/fs/mini_fo/Makefile linux.dev/fs/mini_fo/Makefile
+obj-$(CONFIG_MINI_FO) := mini_fo.o
+mini_fo-objs := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
+
-+O_TARGET := $(obj-$(CONFIG_MINI_FO))
-+obj-y := $(mini_fo-objs)
-+
-+-include $(TOPDIR)/Rules.make
-+
+# dependencies
+${mini_fo-objs}: mini_fo.h fist.h
+