X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fyaffsfs.c;h=37d6cae1d0cce812d4217f6444c06fbaf8360dd5;hb=80d031a7c6cbfc952e9646c5cc3c838ddb4d073f;hp=2b2b8593422466736b82c20d5ccd8fb534bf2c57;hpb=b6299aea4cb86a215e65f04fca38c2eb8b26ee16;p=yaffs2.git

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 2b2b859..37d6cae 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -743,7 +743,15 @@ int yaffs_dup(int handle)
 
 }
 
+static int yaffsfs_TooManyObjects(struct yaffs_dev *dev)
+{
+	int current_objects = dev->n_obj - dev->n_deleted_files;
 
+	if(dev->param.max_objects && current_objects > dev->param.max_objects)
+		return 1;
+	else
+		return 0;
+}
 
 int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 {
@@ -915,6 +923,9 @@ int yaffs_open_sharing(const YCHAR *path, int oflag, int mode, int sharing)
 			if(dir->my_dev->read_only){
 				yaffsfs_SetError(-EROFS);
 				errorReported = 1;
+			} else if(yaffsfs_TooManyObjects(dir->my_dev)) {
+				yaffsfs_SetError(-ENFILE);
+				errorReported = 1;
 			} else
 				obj = yaffs_create_file(dir,name,mode,0,0);
 
@@ -2366,6 +2377,8 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
 		yaffsfs_SetError(-ELOOP);
 	else if(!parent)
 		yaffsfs_SetError(-ENOENT);
+	else if(yaffsfs_TooManyObjects(parent->my_dev))
+		yaffsfs_SetError(-ENFILE);
 	else if(strnlen(name,5) == 0){
 		/* Trying to make the root itself */
 		yaffsfs_SetError(-EEXIST);
@@ -2707,6 +2720,14 @@ int yaffs_inodecount(const YCHAR *path)
 
 void yaffs_add_device(struct yaffs_dev *dev)
 {
+	struct list_head *cfg;
+	/* First check that the device is not in the list. */
+
+	list_for_each(cfg, &yaffsfs_deviceList){
+		if(dev == list_entry(cfg, struct yaffs_dev, dev_list))
+			return;
+	}
+
 	dev->is_mounted = 0;
 	dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback;
 
@@ -2964,6 +2985,8 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
 		yaffsfs_SetError(-ELOOP);
 	else if( !parent || strnlen(name,5) < 1)
 		yaffsfs_SetError(-ENOENT);
+	else if(yaffsfs_TooManyObjects(parent->my_dev))
+		yaffsfs_SetError(-ENFILE);
 	else if(parent->my_dev->read_only)
 		yaffsfs_SetError(-EROFS);
 	else if(parent){
@@ -3056,6 +3079,8 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *linkpath)
 		yaffsfs_SetError(-ENOENT);
 	else if(obj->my_dev->read_only)
 		yaffsfs_SetError(-EROFS);
+	else if(yaffsfs_TooManyObjects(obj->my_dev))
+		yaffsfs_SetError(-ENFILE);
 	else if(lnk)
 		yaffsfs_SetError(-EEXIST);
 	else if(lnk_dir->my_dev != obj->my_dev)