aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-20 00:16:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-20 00:16:41 +0000
commitb74715a0b68e7bb3037c446e1eabea9aa52b8c78 (patch)
tree8704191886acaad56c61635dac6f996dc5152cd4 /target/linux
parent000ae30f6f7f195adfd94da9df8699d08006f660 (diff)
downloadupstream-b74715a0b68e7bb3037c446e1eabea9aa52b8c78.tar.gz
upstream-b74715a0b68e7bb3037c446e1eabea9aa52b8c78.tar.bz2
upstream-b74715a0b68e7bb3037c446e1eabea9aa52b8c78.zip
add mini_fo fix from #1801
SVN-Revision: 7676
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch11
-rw-r--r--target/linux/generic-2.6/patches/209-mini_fo.patch11
2 files changed, 2 insertions, 20 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
index f542fd45c2..5da0a31a60 100644
--- a/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
@@ -2115,7 +2115,7 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fis
diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c
--- linux-2.6.21.1.old/fs/mini_fo/inode.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.1.dev/fs/mini_fo/inode.c 2007-05-26 21:01:26.164329720 +0200
-@@ -0,0 +1,1573 @@
+@@ -0,0 +1,1564 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University
@@ -2670,9 +2670,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ down(&hidden_sto_dir_dentry->d_inode->i_sem);
+#endif
+
-+ /* avoid destroying the hidden inode if the file is in use */
-+ dget(hidden_sto_dentry);
-+
+ /* Delete an old WOL file contained in the storage dir */
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
@@ -2763,9 +2760,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ down(&hidden_sto_dir_dentry->d_inode->i_sem);
+#endif
+
-+ /* avoid destroying the hidden inode if the file is in use */
-+ dget(hidden_sto_dentry);
-+
+ /* Delete an old WOL file contained in the storage dir */
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
@@ -2811,9 +2805,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ down(&hidden_sto_dir_dentry->d_inode->i_sem);
+#endif
+
-+ /* avoid destroying the hidden inode if the file is in use */
-+ dget(hidden_sto_dentry);
-+
+ /* Delete an old WOL file contained in the storage dir */
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
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 5f354c55bc..35c9ec2f09 100644
--- a/target/linux/generic-2.6/patches/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches/209-mini_fo.patch
@@ -2115,7 +2115,7 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fis
diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c
--- linux-2.6.21.1.old/fs/mini_fo/inode.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.21.1.dev/fs/mini_fo/inode.c 2007-05-26 21:01:26.164329720 +0200
-@@ -0,0 +1,1573 @@
+@@ -0,0 +1,1564 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University
@@ -2670,9 +2670,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ down(&hidden_sto_dir_dentry->d_inode->i_sem);
+#endif
+
-+ /* avoid destroying the hidden inode if the file is in use */
-+ dget(hidden_sto_dentry);
-+
+ /* Delete an old WOL file contained in the storage dir */
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
@@ -2763,9 +2760,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ down(&hidden_sto_dir_dentry->d_inode->i_sem);
+#endif
+
-+ /* avoid destroying the hidden inode if the file is in use */
-+ dget(hidden_sto_dentry);
-+
+ /* Delete an old WOL file contained in the storage dir */
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
@@ -2811,9 +2805,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
+ down(&hidden_sto_dir_dentry->d_inode->i_sem);
+#endif
+
-+ /* avoid destroying the hidden inode if the file is in use */
-+ dget(hidden_sto_dentry);
-+
+ /* Delete an old WOL file contained in the storage dir */
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,