git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fatfs: add UTC timestamp option
[safe/jmp/linux-2.6]
/
fs
/
fat
/
cache.c
diff --git
a/fs/fat/cache.c
b/fs/fat/cache.c
index
1959143
..
3a9ecac
100644
(file)
--- a/
fs/fat/cache.c
+++ b/
fs/fat/cache.c
@@
-36,12
+36,11
@@
static inline int fat_max_cache(struct inode *inode)
static struct kmem_cache *fat_cache_cachep;
static struct kmem_cache *fat_cache_cachep;
-static void init_once(
void *foo, struct kmem_cache *cachep, unsigned long flags
)
+static void init_once(
struct kmem_cache *cachep, void *foo
)
{
struct fat_cache *cache = (struct fat_cache *)foo;
{
struct fat_cache *cache = (struct fat_cache *)foo;
- if (flags & SLAB_CTOR_CONSTRUCTOR)
- INIT_LIST_HEAD(&cache->cache_list);
+ INIT_LIST_HEAD(&cache->cache_list);
}
int __init fat_cache_init(void)
}
int __init fat_cache_init(void)
@@
-49,7
+48,7
@@
int __init fat_cache_init(void)
fat_cache_cachep = kmem_cache_create("fat_cache",
sizeof(struct fat_cache),
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
fat_cache_cachep = kmem_cache_create("fat_cache",
sizeof(struct fat_cache),
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
- init_once
, NULL
);
+ init_once);
if (fat_cache_cachep == NULL)
return -ENOMEM;
return 0;
if (fat_cache_cachep == NULL)
return -ENOMEM;
return 0;
@@
-62,7
+61,7
@@
void fat_cache_destroy(void)
static inline struct fat_cache *fat_cache_alloc(struct inode *inode)
{
static inline struct fat_cache *fat_cache_alloc(struct inode *inode)
{
- return kmem_cache_alloc(fat_cache_cachep, GFP_
KERNEL
);
+ return kmem_cache_alloc(fat_cache_cachep, GFP_
NOFS
);
}
static inline void fat_cache_free(struct fat_cache *cache)
}
static inline void fat_cache_free(struct fat_cache *cache)
@@
-243,7
+242,7
@@
int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
/* prevent the infinite loop of cluster chain */
if (*fclus > limit) {
fat_fs_panic(sb, "%s: detected the cluster chain loop"
/* prevent the infinite loop of cluster chain */
if (*fclus > limit) {
fat_fs_panic(sb, "%s: detected the cluster chain loop"
- " (i_pos %lld)", __
FUNCTION
__,
+ " (i_pos %lld)", __
func
__,
MSDOS_I(inode)->i_pos);
nr = -EIO;
goto out;
MSDOS_I(inode)->i_pos);
nr = -EIO;
goto out;
@@
-254,7
+253,7
@@
int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
goto out;
else if (nr == FAT_ENT_FREE) {
fat_fs_panic(sb, "%s: invalid cluster chain"
goto out;
else if (nr == FAT_ENT_FREE) {
fat_fs_panic(sb, "%s: invalid cluster chain"
- " (i_pos %lld)", __
FUNCTION
__,
+ " (i_pos %lld)", __
func
__,
MSDOS_I(inode)->i_pos);
nr = -EIO;
goto out;
MSDOS_I(inode)->i_pos);
nr = -EIO;
goto out;
@@
-287,7
+286,7
@@
static int fat_bmap_cluster(struct inode *inode, int cluster)
return ret;
else if (ret == FAT_ENT_EOF) {
fat_fs_panic(sb, "%s: request beyond EOF (i_pos %lld)",
return ret;
else if (ret == FAT_ENT_EOF) {
fat_fs_panic(sb, "%s: request beyond EOF (i_pos %lld)",
- __
FUNCTION
__, MSDOS_I(inode)->i_pos);
+ __
func
__, MSDOS_I(inode)->i_pos);
return -EIO;
}
return dclus;
return -EIO;
}
return dclus;