Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[~andy/linux] / fs / fat / cache.c

diff --git a/fs/fat/cache.c b/fs/fat/cache.c
index ae8200f84e395f4e27680d509e28ade20807c82e..1cc7038e273de02bb404c91623bec8f65cd85288 100644 (file)
--- a/fs/fat/cache.c
+++ b/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) {