move mini_fo from target/linux/package/ to package/.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3968 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 0 insertions, 706 deletions

diff --git a/target/linux/package/mini_fo/Config.in b/target/linux/package/mini_fo/Config.in
deleted file mode 100644
index a280ff56a..000000000
--- a/target/linux/package/mini_fo/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config PACKAGE_KMOD_MINI_FO
-	prompt "kmod-mini_fo...................... mini fanout overlay file system"
-	tristate
-	default m if DEVEL
-	help
-	  The mini fanout overlay file system.
diff --git a/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile
deleted file mode 100644
index dcd5b91f3..000000000
--- a/target/linux/package/mini_fo/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-include ../../rules.mk
-
-PKG_NAME := mini_fo
-PKG_VERSION := 0.6.2pre1
-PKG_RELEASE := 1
-PKG_MD5SUM := acd12157be25d7b3c8df90914049403e
-
-PKG_SOURCE_URL := http://www.denx.de/twiki/pub/Know/MiniFOHome/
-PKG_SOURCE := mini_fo-0-6-2-pre1.tar.bz2
-PKG_CAT := bzcat
-
-PKG_BUILD_DIR := $(BUILD_DIR)/mini_fo-0-6-2-pre1
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,KMOD_MINI_FO,kmod-mini-fo,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built: 
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		KERNELVERSION="$(KERNEL)" \
-		KERNEL_SRC="$(LINUX_DIR)" \
-		all
-	touch $@
-
-$(IPKG_KMOD_MINI_FO):
-	install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)
-	install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d
-	$(CP) $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \
-	 $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/
-	echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo
-	$(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR)
-
diff --git a/target/linux/package/mini_fo/ipkg/kmod-mini-fo.control b/target/linux/package/mini_fo/ipkg/kmod-mini-fo.control
deleted file mode 100644
index 9ccdc5fa7..000000000
--- a/target/linux/package/mini_fo/ipkg/kmod-mini-fo.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-mini-fo
-Priority: optional
-Section: sys
-Description: mini fanout overlay file system
diff --git a/target/linux/package/mini_fo/patches/101-kmod_build.patch b/target/linux/package/mini_fo/patches/101-kmod_build.patch
deleted file mode 100644
index 9b47a69ab..000000000
--- a/target/linux/package/mini_fo/patches/101-kmod_build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nur mini_fo-0-6-2-pre1/Makefile mini_fo-0-6-2-pre1.patched/Makefile
---- mini_fo-0-6-2-pre1/Makefile	2005-10-15 12:49:43.000000000 +0200
-+++ mini_fo-0-6-2-pre1.patched/Makefile	2005-12-25 14:03:36.864205250 +0100
-@@ -26,36 +26,29 @@
- # allow custom override of TOPINC for fistgen developers
- -include fistdev.mk
- 
-+obj-m := mini_fo.o
-+mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+
- ifeq ($(KERNELVERSION),2.4)
--CFLAGS = -D__KERNEL__ -DMODULE -DFISTGEN -I. ${TOPINC} -O2 -Wall -Wno-unused -g -fno-common -fno-schedule-insns -fno-schedule-insns2 -fno-strict-aliasing -msoft-float -Werror 
--ifeq ($(ARCH),um)
--CFLAGS += $(shell cd $(KERNEL_SRC) ; make script 'SCRIPT=@echo $$(CFLAGS)' ARCH=um)
--endif
--UCFLAGS = -DFISTGEN -I. ${TOPINC} -g -O2 -Wall -Wno-unused -Werror
--endif
- 
--CC	= $(CROSS_COMPILE)gcc
--LD	= $(CROSS_COMPILE)ld
-+O_TARGET := $(obj-m)
-+obj-y := $(mini_fo-objs)
- 
--obj-m := mini_fo.o
--mini_fo-objs   := meta.o dentry.o file.o inode.o main.o super.o state.o aux.o
-+-include $(TOPDIR)/Rules.make
-+
-+endif
- 
- all: mini_fo$(KERNELVERSION)
- 
--mini_fo2.4: ${obj-m}
-+mini_fo2.4:
-+	$(MAKE) -C ${KERNEL_SRC} TOPDIR="${KERNEL_SRC}" SUBDIRS=$(shell pwd) modules
- 
- mini_fo2.6:
--	make -C ${KERNEL_SRC} SUBDIRS=$(PWD) modules
--
--${obj-m}: ${mini_fo-objs}
--	$(LD) -o ${obj-m} -r ${mini_fo-objs}
--
--tags:
--	ctags -R -e
-+	$(MAKE) -C ${KERNEL_SRC} SUBDIRS=$(shell pwd) modules
- 
- clean:
- ifeq ($(KERNELVERSION),2.6)
--	-make -C ${KERNEL_SRC} SUBDIRS=$(PWD) clean
-+	-$(MAKE) -C ${KERNEL_SRC} SUBDIRS=$(shell pwd) clean
- endif
- 	rm -f ${obj-m} ${mini_fo-objs} ${obj-m:.o=.ko} *.d .*.flags *~
- 	rm -f TAGS
diff --git a/target/linux/package/mini_fo/patches/102-mutex_change.patch b/target/linux/package/mini_fo/patches/102-mutex_change.patch
deleted file mode 100644
index 4dec47bf5..000000000
--- a/target/linux/package/mini_fo/patches/102-mutex_change.patch
+++ /dev/null
@@ -1,602 +0,0 @@
-From:  <mk@mary.denx.de>
-Date: Tue, 24 Jan 2006 14:09:21 +0000 (+0100)
-Subject:     Support for new mutex infrastructure
-X-Git-Url: http://www.denx.de/cgi-bin/gitweb.cgi?p=mini_fo.git;a=commitdiff;h=1dcc028729060ea83ea662155634b33ae8e2c493
-
-  Support for new mutex infrastructure
-  (7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
----
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,13 @@
-+2006-01-24  Markus Klotzbuecher  <mk@mary.denx.de>
-+
-+	* Add tons of ugly ifdefs to Ed L. Cashin's mutex patch to
-+          retain backwards compatibility.
-+	
-+2006-01-24  Ed L. Cashin <ecashin@coraid.com>
-+
-+	* Support for the new mutex infrastructure
-+	(7892f2f48d165a34b0b8130c8a195dfd807b8cb6)
-+
- 2005-10-15  Markus Klotzbuecher  <mk@localhost.localdomain>
- 
- 	* Bugfix for a serious memory leak in mini_fo_follow_link.
---- a/aux.c
-+++ b/aux.c
-@@ -435,8 +435,11 @@ int build_sto_structure(dentry_t *dir, d
- 
- 	/* was:	hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
--
-+#endif
- 	/* lets be safe */
- 	if(dtohd2(dir) != hidden_sto_dir_dentry) {
- 		printk(KERN_CRIT "mini_fo: build_sto_structure: invalid parameter or meta data corruption [2].\n");
-@@ -457,7 +460,11 @@ int build_sto_structure(dentry_t *dir, d
- 	if(err) {
- 		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [1].\n");
- 		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
- 		up(&dir->d_inode->i_sem);
-+#endif
- 		dput(dir);
- 		return err;
- 	}
-@@ -466,7 +473,11 @@ int build_sto_structure(dentry_t *dir, d
- 	if(!dtohd2(dentry)->d_inode) {
- 		printk(KERN_CRIT "mini_fo: build_sto_structure: failed to create storage dir [2].\n");
- 		/* was: unlock_dir(dir); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&dir->d_inode->i_mutex);
-+#else
- 		up(&dir->d_inode->i_sem);
-+#endif
- 		dput(dir);
- 		return 1;
- 	}
-@@ -485,7 +496,11 @@ int build_sto_structure(dentry_t *dir, d
- 				 hidden_sto_dir_dentry->d_inode);
- 	dir->d_inode->i_nlink++;
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_sto_dir_dentry);
- 	return 0;
- }
---- a/file.c
-+++ b/file.c
-@@ -613,18 +613,34 @@ mini_fo_fsync(file_t *file, dentry_t *de
- 	if ((hidden_file = ftohf(file)) != NULL) {
- 		hidden_dentry = dtohd(dentry);
- 		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 			down(&hidden_dentry->d_inode->i_sem);
-+#endif
- 			err1 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 			up(&hidden_dentry->d_inode->i_sem);
-+#endif
- 		}
- 	}
- 
- 	if ((hidden_file = ftohf2(file)) != NULL) {
- 		hidden_dentry = dtohd2(dentry);
- 		if (hidden_file->f_op && hidden_file->f_op->fsync) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 			down(&hidden_dentry->d_inode->i_sem);
-+#endif
- 			err2 = hidden_file->f_op->fsync(hidden_file, hidden_dentry, datasync);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+			mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 			up(&hidden_dentry->d_inode->i_sem);
-+#endif
- 		}
- 	}
- 	else
---- a/inode.c
-+++ b/inode.c
-@@ -355,7 +355,11 @@ mini_fo_link(dentry_t *old_dentry, inode
- 
- 	/* was: hidden_dir_dentry = lock_parent(hidden_new_dentry); */
- 	hidden_dir_dentry = dget(hidden_new_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
- 	down(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
- 
- 	err = vfs_link(hidden_old_dentry,
- 		       hidden_dir_dentry->d_inode,
-@@ -374,7 +378,11 @@ mini_fo_link(dentry_t *old_dentry, inode
- 
-  out_lock:
- 	/* was: unlock_dir(hidden_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_dir_dentry);
- 
- 	dput(hidden_new_dentry);
-@@ -452,7 +460,11 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	dget(hidden_sto_dentry);
- 	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 	mode = S_IALLUGO;
-@@ -481,7 +493,11 @@ mini_fo_symlink(inode_t *dir, dentry_t *
- 	
-  out_lock:
-         /* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_sto_dir_dentry);
- 
-         dput(hidden_sto_dentry);
-@@ -524,7 +540,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- 
- 		/* was:hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
- 		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		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);
-@@ -572,7 +592,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- 					 dentry->d_name.len);
- 		}
- 		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 		dput(hidden_sto_dir_dentry);
- 		goto out;
- 	}
-@@ -602,7 +626,12 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- 
- 		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
- 		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		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);
-@@ -630,7 +659,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- 		dtopd(dentry)->state = NON_EXISTANT;
- 
- 		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 		dput(hidden_sto_dir_dentry);
- 
- 		goto out;
-@@ -641,7 +674,12 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- 
- 		/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
- 		hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		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);
-@@ -668,7 +706,12 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
- 		dentry->d_inode->i_nlink = itohi2(dentry->d_inode)->i_nlink;
- 		dtopd(dentry)->state = DELETED;
- 		/* was: unlock_dir(hidden_sto_dir_dentry); */
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 		dput(hidden_sto_dir_dentry);
- 		goto out;
- 	}
-@@ -1294,11 +1337,19 @@ mini_fo_getxattr(struct dentry *dentry, 
- 		encoded_name = (char *)name;
- 		encoded_value = (char *)value;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		down(&hidden_dentry->d_inode->i_sem);
-+#endif
- 		/* lock_kernel() already done by caller. */
- 		err = hidden_dentry->d_inode->i_op->getxattr(hidden_dentry, encoded_name, encoded_value, size);
- 		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_dentry->d_inode->i_sem);
-+#endif
- 	}
- 	return err;
- }
-@@ -1340,11 +1391,19 @@ mini_fo_setxattr(struct dentry *dentry, 
- 		encoded_name = (char *)name;
- 		encoded_value = (char *)value;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		down(&hidden_dentry->d_inode->i_sem);
-+#endif
- 		/* lock_kernel() already done by caller. */
- 		err = hidden_dentry->d_inode->i_op->setxattr(hidden_dentry, encoded_name, encoded_value, size, flags);
- 		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_dentry->d_inode->i_sem);
-+#endif
- 	}
- 	return err;
- }
-@@ -1372,11 +1431,19 @@ mini_fo_removexattr(struct dentry *dentr
- 	if (hidden_dentry->d_inode->i_op->removexattr) {
- 		encoded_name = (char *)name;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		down(&hidden_dentry->d_inode->i_sem);
-+#endif
- 		/* lock_kernel() already done by caller. */
- 		err = hidden_dentry->d_inode->i_op->removexattr(hidden_dentry, encoded_name);
- 		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_dentry->d_inode->i_sem);
-+#endif
- 	}
- 	return err;
- }
-@@ -1403,11 +1470,20 @@ mini_fo_listxattr(struct dentry *dentry,
- 
- 	if (hidden_dentry->d_inode->i_op->listxattr) {
- 		encoded_list = list;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		down(&hidden_dentry->d_inode->i_sem);
-+#endif
- 		/* lock_kernel() already done by caller. */
- 		err = hidden_dentry->d_inode->i_op->listxattr(hidden_dentry, encoded_list, size);
- 		/* unlock_kernel() will be done by caller. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_dentry->d_inode->i_sem);
-+#endif
- 	}
- 	return err;
- }
---- a/meta.c
-+++ b/meta.c
-@@ -650,9 +650,20 @@ int meta_sync_d_list(dentry_t *dentry, i
- 		struct iattr newattrs;
-                 newattrs.ia_size = 0;
-                 newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-                 down(&meta_dentry->d_inode->i_sem);
-+#endif
-                 err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-                 up(&meta_dentry->d_inode->i_sem);
-+#endif
-+
-                 if(err || meta_dentry->d_inode->i_size != 0) {
-                         printk(KERN_CRIT "mini_fo: meta_sync_d_list: \
-                                           ERROR truncating meta file.\n");
-@@ -780,9 +791,19 @@ int meta_sync_r_list(dentry_t *dentry, i
- 		struct iattr newattrs;
-                 newattrs.ia_size = 0;
-                 newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_lock(&meta_dentry->d_inode->i_mutex);
-+#else
-                 down(&meta_dentry->d_inode->i_sem);
-+#endif
-                 err = notify_change(meta_dentry, &newattrs);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&meta_dentry->d_inode->i_mutex);
-+#else
-                 up(&meta_dentry->d_inode->i_sem);
-+#endif
-                 if(err || meta_dentry->d_inode->i_size != 0) {
-                         printk(KERN_CRIT "mini_fo: meta_sync_r_list: \
-                                           ERROR truncating meta file.\n");
---- a/mini_fo.h
-+++ b/mini_fo.h
-@@ -433,6 +433,33 @@ fist_copy_attr_all(inode_t *dest, const 
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- /* copied from linux/fs.h */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+static inline void double_lock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	if (m1 != m2) {
-+		if ((unsigned long) m1 < (unsigned long) m2) {
-+			struct mutex *tmp = m2;
-+			m2 = m1; m1 = tmp;
-+		}
-+		mutex_lock(m1);
-+	}
-+	mutex_lock(m2);
-+}
-+
-+static inline void double_unlock(struct dentry *d1, struct dentry *d2)
-+{
-+	struct mutex *m1 = &d1->d_inode->i_mutex;
-+	struct mutex *m2 = &d2->d_inode->i_mutex;
-+	mutex_unlock(m1);
-+	if (m1 != m2)
-+		mutex_unlock(m2);
-+	dput(d1);
-+	dput(d2);
-+}
-+
-+#else
- static inline void double_down(struct semaphore *s1, struct semaphore *s2)
- {
-         if (s1 != s2) {
-@@ -463,8 +490,8 @@ static inline void double_unlock(struct 
-         dput(d1);
-         dput(d2);
- }
--
--#endif
-+#endif   /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) */
-+#endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
- #endif /* __KERNEL__ */
- 
- /*
---- a/mmap.c
-+++ b/mmap.c
-@@ -478,7 +478,11 @@ mini_fo_commit_write(file_t *file, page_
- 	if (ftopd(file) != NULL)
- 		hidden_file = ftohf(file);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_inode->i_mutex);
-+#else
- 	down(&hidden_inode->i_sem);
-+#endif
- 	/* find lower page (returns a locked page) */
- 	hidden_page = grab_cache_page(hidden_inode->i_mapping, page->index);
- 	if (!hidden_page)
-@@ -556,7 +560,12 @@ mini_fo_commit_write(file_t *file, page_
- 		ClearPageUptodate(page);
- 	else
- 		SetPageUptodate(page);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_inode->i_mutex);
-+#else
- 	up(&hidden_inode->i_sem);
-+#endif
- 	print_exit_status(err);
- 	return err;			/* assume all is ok */
- }
---- a/state.c
-+++ b/state.c
-@@ -44,7 +44,12 @@ int create_sto_reg_file(dentry_t *dentry
- 
- 	/* lock parent */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-         down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 
- 	err = PTR_ERR(hidden_sto_dir_dentry);
-         if (IS_ERR(hidden_sto_dir_dentry))
-@@ -97,7 +102,11 @@ int create_sto_reg_file(dentry_t *dentry
- 				 hidden_sto_dir_dentry->d_inode);
- 
-  out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-         dput(hidden_sto_dir_dentry);
-  out:
- 	return err;
-@@ -130,7 +139,12 @@ n");
- 
- 	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 
- 	err = PTR_ERR(hidden_sto_dir_dentry);
- 	if (IS_ERR(hidden_sto_dir_dentry))
-@@ -184,7 +198,11 @@ n");
- 
-  out_lock:
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_sto_dir_dentry);
-  out:
- 	return err;
-@@ -217,7 +235,12 @@ int create_sto_nod(dentry_t *dentry, int
- 	
- 	/* lock parent */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	
- 	err = PTR_ERR(hidden_sto_dir_dentry);
- 	if (IS_ERR(hidden_sto_dir_dentry))
-@@ -260,7 +283,11 @@ int create_sto_nod(dentry_t *dentry, int
- 	fist_copy_attr_timesizes(dir, hidden_sto_dir_dentry->d_inode);
- 
-  out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_sto_dir_dentry);
-  out:
- 	return err;
-@@ -314,7 +341,12 @@ int nondir_unmod_to_mod(dentry_t *dentry
- 
- 	/* lock parent */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
-         down(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 
- 	err = PTR_ERR(hidden_sto_dir_dentry);
-         if (IS_ERR(hidden_sto_dir_dentry))
-@@ -365,7 +397,12 @@ int nondir_unmod_to_mod(dentry_t *dentry
- 	if((cp_flag == 1) && S_ISREG(dentry->d_inode->i_mode)) {
- 
- 		/* unlock first */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+		mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 		up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-+
- 		dput(hidden_sto_dir_dentry);
- 
- 		tgt_dentry = dtohd2(dentry);
-@@ -383,7 +420,11 @@ int nondir_unmod_to_mod(dentry_t *dentry
- 	}
- 
-  out_lock:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
-         dput(hidden_sto_dir_dentry);
-  out:
- 	return err;
-@@ -420,7 +461,12 @@ int nondir_creat_to_del(dentry_t *dentry
- 	
- 	/* was: hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry);*/
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	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);
-@@ -435,7 +481,11 @@ int nondir_creat_to_del(dentry_t *dentry
- 	dtost(dentry) = NON_EXISTANT;
- 	
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_sto_dir_dentry);
- 	
-  out:
-@@ -464,7 +514,12 @@ int nondir_mod_to_del(dentry_t *dentry)
- 	
- 	/* was hidden_sto_dir_dentry = lock_parent(hidden_sto_dentry); */
- 	hidden_sto_dir_dentry = dget(hidden_sto_dentry->d_parent);
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_lock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	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);
-@@ -488,7 +543,11 @@ int nondir_mod_to_del(dentry_t *dentry)
- 			 dentry->d_name.len);
- 	
- 	/* was: unlock_dir(hidden_sto_dir_dentry); */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-+	mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex);
-+#else
- 	up(&hidden_sto_dir_dentry->d_inode->i_sem);
-+#endif
- 	dput(hidden_sto_dir_dentry);
- 
-  out:
-