diff options
Diffstat (limited to 'kernel/fs/minix')
| -rw-r--r-- | kernel/fs/minix/dir.c | 5 | ||||
| -rw-r--r-- | kernel/fs/minix/inode.c | 2 | ||||
| -rw-r--r-- | kernel/fs/minix/minix.h | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/kernel/fs/minix/dir.c b/kernel/fs/minix/dir.c index 118e4e7bc..d19ac2581 100644 --- a/kernel/fs/minix/dir.c +++ b/kernel/fs/minix/dir.c @@ -45,11 +45,6 @@ minix_last_byte(struct inode *inode, unsigned long page_nr) return last_byte; } -static inline unsigned long dir_pages(struct inode *inode) -{ - return (inode->i_size+PAGE_CACHE_SIZE-1)>>PAGE_CACHE_SHIFT; -} - static int dir_commit_chunk(struct page *page, loff_t pos, unsigned len) { struct address_space *mapping = page->mapping; diff --git a/kernel/fs/minix/inode.c b/kernel/fs/minix/inode.c index 1182d1e26..086cd0a61 100644 --- a/kernel/fs/minix/inode.c +++ b/kernel/fs/minix/inode.c @@ -62,7 +62,7 @@ static struct kmem_cache * minix_inode_cachep; static struct inode *minix_alloc_inode(struct super_block *sb) { struct minix_inode_info *ei; - ei = (struct minix_inode_info *)kmem_cache_alloc(minix_inode_cachep, GFP_KERNEL); + ei = kmem_cache_alloc(minix_inode_cachep, GFP_KERNEL); if (!ei) return NULL; return &ei->vfs_inode; diff --git a/kernel/fs/minix/minix.h b/kernel/fs/minix/minix.h index 1ebd11854..01ad81dca 100644 --- a/kernel/fs/minix/minix.h +++ b/kernel/fs/minix/minix.h @@ -84,7 +84,7 @@ static inline struct minix_sb_info *minix_sb(struct super_block *sb) static inline struct minix_inode_info *minix_i(struct inode *inode) { - return list_entry(inode, struct minix_inode_info, vfs_inode); + return container_of(inode, struct minix_inode_info, vfs_inode); } static inline unsigned minix_blocks_needed(unsigned bits, unsigned blocksize) |