---

yaml --- r: 250106 b: refs/heads/master c: 7003092 h: refs/heads/master v: v3
git-mirror · Apr 12, 2011 · a4a3b30 · a4a3b30
1 parent 9e76e1a
commit a4a3b30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 384f5c96ea05aba24a11172ebd6f5d427ca199fc
+refs/heads/master: 700309295551ef9217e4ae00a5b1d3030fc5438c
diff --git a/trunk/fs/fat/cache.c b/trunk/fs/fat/cache.c
@@ -151,6 +151,13 @@ static void fat_cache_add(struct inode *inode, struct fat_cache_id *new)
 			spin_unlock(&MSDOS_I(inode)->cache_lru_lock);
 
 			tmp = fat_cache_alloc(inode);
+			if (!tmp) {
+				spin_lock(&MSDOS_I(inode)->cache_lru_lock);
+				MSDOS_I(inode)->nr_caches--;
+				spin_unlock(&MSDOS_I(inode)->cache_lru_lock);
+				return;
+			}
+
 			spin_lock(&MSDOS_I(inode)->cache_lru_lock);
 			cache = fat_cache_merge(inode, new);
 			if (cache != NULL) {