diff options
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/inode.c | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_extent.c | 8 | ||||
-rw-r--r-- | fs/jfs/jfs_inode.h | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_metapage.c | 7 | ||||
-rw-r--r-- | fs/jfs/jfs_metapage.h | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_txnmgr.c | 2 | ||||
-rw-r--r-- | fs/jfs/super.c | 12 |
7 files changed, 17 insertions, 18 deletions
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c index 04eb78f1252e..43e3f566aad6 100644 --- a/fs/jfs/inode.c +++ b/fs/jfs/inode.c | |||
@@ -305,7 +305,7 @@ static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb, | |||
305 | offset, nr_segs, jfs_get_block, NULL); | 305 | offset, nr_segs, jfs_get_block, NULL); |
306 | } | 306 | } |
307 | 307 | ||
308 | struct address_space_operations jfs_aops = { | 308 | const struct address_space_operations jfs_aops = { |
309 | .readpage = jfs_readpage, | 309 | .readpage = jfs_readpage, |
310 | .readpages = jfs_readpages, | 310 | .readpages = jfs_readpages, |
311 | .writepage = jfs_writepage, | 311 | .writepage = jfs_writepage, |
diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c index 5549378358bf..4d52593a5fc6 100644 --- a/fs/jfs/jfs_extent.c +++ b/fs/jfs/jfs_extent.c | |||
@@ -126,7 +126,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | |||
126 | 126 | ||
127 | /* allocate the disk blocks for the extent. initially, extBalloc() | 127 | /* allocate the disk blocks for the extent. initially, extBalloc() |
128 | * will try to allocate disk blocks for the requested size (xlen). | 128 | * will try to allocate disk blocks for the requested size (xlen). |
129 | * if this fails (xlen contigious free blocks not avaliable), it'll | 129 | * if this fails (xlen contiguous free blocks not avaliable), it'll |
130 | * try to allocate a smaller number of blocks (producing a smaller | 130 | * try to allocate a smaller number of blocks (producing a smaller |
131 | * extent), with this smaller number of blocks consisting of the | 131 | * extent), with this smaller number of blocks consisting of the |
132 | * requested number of blocks rounded down to the next smaller | 132 | * requested number of blocks rounded down to the next smaller |
@@ -493,7 +493,7 @@ int extFill(struct inode *ip, xad_t * xp) | |||
493 | * | 493 | * |
494 | * initially, we will try to allocate disk blocks for the | 494 | * initially, we will try to allocate disk blocks for the |
495 | * requested size (nblocks). if this fails (nblocks | 495 | * requested size (nblocks). if this fails (nblocks |
496 | * contigious free blocks not avaliable), we'll try to allocate | 496 | * contiguous free blocks not avaliable), we'll try to allocate |
497 | * a smaller number of blocks (producing a smaller extent), with | 497 | * a smaller number of blocks (producing a smaller extent), with |
498 | * this smaller number of blocks consisting of the requested | 498 | * this smaller number of blocks consisting of the requested |
499 | * number of blocks rounded down to the next smaller power of 2 | 499 | * number of blocks rounded down to the next smaller power of 2 |
@@ -529,7 +529,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno) | |||
529 | 529 | ||
530 | /* get the number of blocks to initially attempt to allocate. | 530 | /* get the number of blocks to initially attempt to allocate. |
531 | * we'll first try the number of blocks requested unless this | 531 | * we'll first try the number of blocks requested unless this |
532 | * number is greater than the maximum number of contigious free | 532 | * number is greater than the maximum number of contiguous free |
533 | * blocks in the map. in that case, we'll start off with the | 533 | * blocks in the map. in that case, we'll start off with the |
534 | * maximum free. | 534 | * maximum free. |
535 | */ | 535 | */ |
@@ -586,7 +586,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno) | |||
586 | * in place. if this fails, we'll try to move the extent | 586 | * in place. if this fails, we'll try to move the extent |
587 | * to a new set of blocks. if moving the extent, we initially | 587 | * to a new set of blocks. if moving the extent, we initially |
588 | * will try to allocate disk blocks for the requested size | 588 | * will try to allocate disk blocks for the requested size |
589 | * (nnew). if this fails (nnew contigious free blocks not | 589 | * (nnew). if this fails (new contiguous free blocks not |
590 | * avaliable), we'll try to allocate a smaller number of | 590 | * avaliable), we'll try to allocate a smaller number of |
591 | * blocks (producing a smaller extent), with this smaller | 591 | * blocks (producing a smaller extent), with this smaller |
592 | * number of blocks consisting of the requested number of | 592 | * number of blocks consisting of the requested number of |
diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h index c30072674464..b5c7da6190dc 100644 --- a/fs/jfs/jfs_inode.h +++ b/fs/jfs/jfs_inode.h | |||
@@ -33,7 +33,7 @@ extern void jfs_free_zero_link(struct inode *); | |||
33 | extern struct dentry *jfs_get_parent(struct dentry *dentry); | 33 | extern struct dentry *jfs_get_parent(struct dentry *dentry); |
34 | extern void jfs_set_inode_flags(struct inode *); | 34 | extern void jfs_set_inode_flags(struct inode *); |
35 | 35 | ||
36 | extern struct address_space_operations jfs_aops; | 36 | extern const struct address_space_operations jfs_aops; |
37 | extern struct inode_operations jfs_dir_inode_operations; | 37 | extern struct inode_operations jfs_dir_inode_operations; |
38 | extern const struct file_operations jfs_dir_operations; | 38 | extern const struct file_operations jfs_dir_operations; |
39 | extern struct inode_operations jfs_file_inode_operations; | 39 | extern struct inode_operations jfs_file_inode_operations; |
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 2b220dd6b4e7..e1e0a6e6ebdf 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c | |||
@@ -577,7 +577,7 @@ static void metapage_invalidatepage(struct page *page, unsigned long offset) | |||
577 | metapage_releasepage(page, 0); | 577 | metapage_releasepage(page, 0); |
578 | } | 578 | } |
579 | 579 | ||
580 | struct address_space_operations jfs_metapage_aops = { | 580 | const struct address_space_operations jfs_metapage_aops = { |
581 | .readpage = metapage_readpage, | 581 | .readpage = metapage_readpage, |
582 | .writepage = metapage_writepage, | 582 | .writepage = metapage_writepage, |
583 | .sync_page = block_sync_page, | 583 | .sync_page = block_sync_page, |
@@ -632,10 +632,9 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock, | |||
632 | } | 632 | } |
633 | SetPageUptodate(page); | 633 | SetPageUptodate(page); |
634 | } else { | 634 | } else { |
635 | page = read_cache_page(mapping, page_index, | 635 | page = read_mapping_page(mapping, page_index, NULL); |
636 | (filler_t *)mapping->a_ops->readpage, NULL); | ||
637 | if (IS_ERR(page) || !PageUptodate(page)) { | 636 | if (IS_ERR(page) || !PageUptodate(page)) { |
638 | jfs_err("read_cache_page failed!"); | 637 | jfs_err("read_mapping_page failed!"); |
639 | return NULL; | 638 | return NULL; |
640 | } | 639 | } |
641 | lock_page(page); | 640 | lock_page(page); |
diff --git a/fs/jfs/jfs_metapage.h b/fs/jfs/jfs_metapage.h index f0b7d3282b07..d17a3290f5aa 100644 --- a/fs/jfs/jfs_metapage.h +++ b/fs/jfs/jfs_metapage.h | |||
@@ -139,7 +139,7 @@ static inline void metapage_homeok(struct metapage *mp) | |||
139 | put_metapage(mp); | 139 | put_metapage(mp); |
140 | } | 140 | } |
141 | 141 | ||
142 | extern struct address_space_operations jfs_metapage_aops; | 142 | extern const struct address_space_operations jfs_metapage_aops; |
143 | 143 | ||
144 | /* | 144 | /* |
145 | * This routines invalidate all pages for an extent. | 145 | * This routines invalidate all pages for an extent. |
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 49618dd94f9a..efbb586bed4b 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c | |||
@@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, | |||
842 | TXN_UNLOCK(); | 842 | TXN_UNLOCK(); |
843 | release_metapage(mp); | 843 | release_metapage(mp); |
844 | TXN_LOCK(); | 844 | TXN_LOCK(); |
845 | xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */ | 845 | xtid = tlck->tid; /* reacquire after dropping TXN_LOCK */ |
846 | 846 | ||
847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", | 847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", |
848 | tid, xtid, lid); | 848 | tid, xtid, lid); |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index db6f41d6dd60..4f6cfebc82db 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
@@ -18,7 +18,6 @@ | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
21 | #include <linux/config.h> | ||
22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
23 | #include <linux/parser.h> | 22 | #include <linux/parser.h> |
24 | #include <linux/completion.h> | 23 | #include <linux/completion.h> |
@@ -139,9 +138,9 @@ static void jfs_destroy_inode(struct inode *inode) | |||
139 | kmem_cache_free(jfs_inode_cachep, ji); | 138 | kmem_cache_free(jfs_inode_cachep, ji); |
140 | } | 139 | } |
141 | 140 | ||
142 | static int jfs_statfs(struct super_block *sb, struct kstatfs *buf) | 141 | static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf) |
143 | { | 142 | { |
144 | struct jfs_sb_info *sbi = JFS_SBI(sb); | 143 | struct jfs_sb_info *sbi = JFS_SBI(dentry->d_sb); |
145 | s64 maxinodes; | 144 | s64 maxinodes; |
146 | struct inomap *imap = JFS_IP(sbi->ipimap)->i_imap; | 145 | struct inomap *imap = JFS_IP(sbi->ipimap)->i_imap; |
147 | 146 | ||
@@ -565,10 +564,11 @@ static void jfs_unlockfs(struct super_block *sb) | |||
565 | } | 564 | } |
566 | } | 565 | } |
567 | 566 | ||
568 | static struct super_block *jfs_get_sb(struct file_system_type *fs_type, | 567 | static int jfs_get_sb(struct file_system_type *fs_type, |
569 | int flags, const char *dev_name, void *data) | 568 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
570 | { | 569 | { |
571 | return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super); | 570 | return get_sb_bdev(fs_type, flags, dev_name, data, jfs_fill_super, |
571 | mnt); | ||
572 | } | 572 | } |
573 | 573 | ||
574 | static int jfs_sync_fs(struct super_block *sb, int wait) | 574 | static int jfs_sync_fs(struct super_block *sb, int wait) |