diff options
Diffstat (limited to 'fs/adfs')
| -rw-r--r-- | fs/adfs/inode.c | 1 | ||||
| -rw-r--r-- | fs/adfs/super.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c index 534f3eecc985..7e7a04be1278 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c | |||
| @@ -269,7 +269,6 @@ adfs_iget(struct super_block *sb, struct object_info *obj) | |||
| 269 | inode->i_ino = obj->file_id; | 269 | inode->i_ino = obj->file_id; |
| 270 | inode->i_size = obj->size; | 270 | inode->i_size = obj->size; |
| 271 | inode->i_nlink = 2; | 271 | inode->i_nlink = 2; |
| 272 | inode->i_blksize = PAGE_SIZE; | ||
| 273 | inode->i_blocks = (inode->i_size + sb->s_blocksize - 1) >> | 272 | inode->i_blocks = (inode->i_size + sb->s_blocksize - 1) >> |
| 274 | sb->s_blocksize_bits; | 273 | sb->s_blocksize_bits; |
| 275 | 274 | ||
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 82011019494c..9ade139086fc 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
| @@ -251,8 +251,7 @@ static int init_inodecache(void) | |||
| 251 | 251 | ||
| 252 | static void destroy_inodecache(void) | 252 | static void destroy_inodecache(void) |
| 253 | { | 253 | { |
| 254 | if (kmem_cache_destroy(adfs_inode_cachep)) | 254 | kmem_cache_destroy(adfs_inode_cachep); |
| 255 | printk(KERN_INFO "adfs_inode_cache: not all structures were freed\n"); | ||
| 256 | } | 255 | } |
| 257 | 256 | ||
| 258 | static struct super_operations adfs_sops = { | 257 | static struct super_operations adfs_sops = { |
| @@ -339,11 +338,10 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 339 | 338 | ||
| 340 | sb->s_flags |= MS_NODIRATIME; | 339 | sb->s_flags |= MS_NODIRATIME; |
| 341 | 340 | ||
| 342 | asb = kmalloc(sizeof(*asb), GFP_KERNEL); | 341 | asb = kzalloc(sizeof(*asb), GFP_KERNEL); |
| 343 | if (!asb) | 342 | if (!asb) |
| 344 | return -ENOMEM; | 343 | return -ENOMEM; |
| 345 | sb->s_fs_info = asb; | 344 | sb->s_fs_info = asb; |
| 346 | memset(asb, 0, sizeof(*asb)); | ||
| 347 | 345 | ||
| 348 | /* set default options */ | 346 | /* set default options */ |
| 349 | asb->s_uid = 0; | 347 | asb->s_uid = 0; |
