diff options
| -rw-r--r-- | fs/dlm/lock.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/acl.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/bmap.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/daemon.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/dir.c | 13 | ||||
| -rw-r--r-- | fs/gfs2/eaops.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/eattr.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/glock.c | 12 | ||||
| -rw-r--r-- | fs/gfs2/inode.c | 5 | ||||
| -rw-r--r-- | fs/gfs2/inode.h | 2 | ||||
| -rw-r--r-- | fs/gfs2/lm.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/locking/dlm/thread.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/lops.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/main.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/ops_address.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/ops_file.c | 6 | ||||
| -rw-r--r-- | fs/gfs2/ops_fstype.c | 18 | ||||
| -rw-r--r-- | fs/gfs2/ops_inode.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/ops_super.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/quota.c | 6 | ||||
| -rw-r--r-- | fs/gfs2/recovery.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/rgrp.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/super.c | 5 |
23 files changed, 51 insertions, 54 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index af2f2f01bd5f..3f2befa4797b 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c | |||
| @@ -1757,7 +1757,7 @@ static int do_unlock(struct dlm_rsb *r, struct dlm_lkb *lkb) | |||
| 1757 | skip the queue_cast(ECANCEL). It indicates that the request/convert | 1757 | skip the queue_cast(ECANCEL). It indicates that the request/convert |
| 1758 | completed (and queued a normal ast) just before the cancel; we don't | 1758 | completed (and queued a normal ast) just before the cancel; we don't |
| 1759 | want to clobber the sb_result for the normal ast with ECANCEL. */ | 1759 | want to clobber the sb_result for the normal ast with ECANCEL. */ |
| 1760 | 1760 | ||
| 1761 | static int do_cancel(struct dlm_rsb *r, struct dlm_lkb *lkb) | 1761 | static int do_cancel(struct dlm_rsb *r, struct dlm_lkb *lkb) |
| 1762 | { | 1762 | { |
| 1763 | revert_lock(r, lkb); | 1763 | revert_lock(r, lkb); |
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 3123fc071233..5f959b8ce406 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c | |||
| @@ -181,7 +181,7 @@ int gfs2_check_acl(struct inode *inode, int mask) | |||
| 181 | error = gfs2_check_acl_locked(inode, mask); | 181 | error = gfs2_check_acl_locked(inode, mask); |
| 182 | gfs2_glock_dq_uninit(&i_gh); | 182 | gfs2_glock_dq_uninit(&i_gh); |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | return error; | 185 | return error; |
| 186 | } | 186 | } |
| 187 | 187 | ||
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 3fb9a26b6f58..92eef825167d 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c | |||
| @@ -130,7 +130,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) | |||
| 130 | error = gfs2_meta_inode_buffer(ip, &dibh); | 130 | error = gfs2_meta_inode_buffer(ip, &dibh); |
| 131 | if (error) | 131 | if (error) |
| 132 | goto out; | 132 | goto out; |
| 133 | 133 | ||
| 134 | if (ip->i_di.di_size) { | 134 | if (ip->i_di.di_size) { |
| 135 | /* Get a free block, fill it with the stuffed data, | 135 | /* Get a free block, fill it with the stuffed data, |
| 136 | and write it out to disk */ | 136 | and write it out to disk */ |
| @@ -246,7 +246,7 @@ static int build_height(struct inode *inode, unsigned height) | |||
| 246 | blocks[n] = gfs2_meta_new(ip->i_gl, bn); | 246 | blocks[n] = gfs2_meta_new(ip->i_gl, bn); |
| 247 | gfs2_trans_add_bh(ip->i_gl, blocks[n], 1); | 247 | gfs2_trans_add_bh(ip->i_gl, blocks[n], 1); |
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | n = 0; | 250 | n = 0; |
| 251 | bn = blocks[0]->b_blocknr; | 251 | bn = blocks[0]->b_blocknr; |
| 252 | if (new_height > 1) { | 252 | if (new_height > 1) { |
diff --git a/fs/gfs2/daemon.c b/fs/gfs2/daemon.c index a9908cd78cd9..cab1f68d4685 100644 --- a/fs/gfs2/daemon.c +++ b/fs/gfs2/daemon.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | /* This uses schedule_timeout() instead of msleep() because it's good for | 30 | /* This uses schedule_timeout() instead of msleep() because it's good for |
| 31 | the daemons to wake up more often than the timeout when unmounting so | 31 | the daemons to wake up more often than the timeout when unmounting so |
| 32 | the user's unmount doesn't sit there forever. | 32 | the user's unmount doesn't sit there forever. |
| 33 | 33 | ||
| 34 | The kthread functions used to start these daemons block and flush signals. */ | 34 | The kthread functions used to start these daemons block and flush signals. */ |
| 35 | 35 | ||
| 36 | /** | 36 | /** |
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 40e94ac0b93d..459498cac93b 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c | |||
| @@ -81,7 +81,7 @@ | |||
| 81 | #define gfs2_disk_hash2offset(h) (((u64)(h)) >> 1) | 81 | #define gfs2_disk_hash2offset(h) (((u64)(h)) >> 1) |
| 82 | #define gfs2_dir_offset2hash(p) ((u32)(((u64)(p)) << 1)) | 82 | #define gfs2_dir_offset2hash(p) ((u32)(((u64)(p)) << 1)) |
| 83 | 83 | ||
| 84 | typedef int (*leaf_call_t) (struct gfs2_inode *dip, u32 index, u32 len, | 84 | typedef int (*leaf_call_t) (struct gfs2_inode *dip, u32 index, u32 len, |
| 85 | u64 leaf_no, void *data); | 85 | u64 leaf_no, void *data); |
| 86 | typedef int (*gfs2_dscan_t)(const struct gfs2_dirent *dent, | 86 | typedef int (*gfs2_dscan_t)(const struct gfs2_dirent *dent, |
| 87 | const struct qstr *name, void *opaque); | 87 | const struct qstr *name, void *opaque); |
| @@ -119,7 +119,6 @@ static int gfs2_dir_get_existing_buffer(struct gfs2_inode *ip, u64 block, | |||
| 119 | 119 | ||
| 120 | static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, | 120 | static int gfs2_dir_write_stuffed(struct gfs2_inode *ip, const char *buf, |
| 121 | unsigned int offset, unsigned int size) | 121 | unsigned int offset, unsigned int size) |
| 122 | |||
| 123 | { | 122 | { |
| 124 | struct buffer_head *dibh; | 123 | struct buffer_head *dibh; |
| 125 | int error; | 124 | int error; |
| @@ -685,7 +684,7 @@ static struct gfs2_dirent *gfs2_dirent_alloc(struct inode *inode, | |||
| 685 | const struct qstr *name) | 684 | const struct qstr *name) |
| 686 | { | 685 | { |
| 687 | struct gfs2_dirent *dent; | 686 | struct gfs2_dirent *dent; |
| 688 | dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, | 687 | dent = gfs2_dirent_scan(inode, bh->b_data, bh->b_size, |
| 689 | gfs2_dirent_find_space, name, NULL); | 688 | gfs2_dirent_find_space, name, NULL); |
| 690 | if (!dent || IS_ERR(dent)) | 689 | if (!dent || IS_ERR(dent)) |
| 691 | return dent; | 690 | return dent; |
| @@ -764,7 +763,7 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode, | |||
| 764 | gfs2_consist_inode(ip); | 763 | gfs2_consist_inode(ip); |
| 765 | return ERR_PTR(-EIO); | 764 | return ERR_PTR(-EIO); |
| 766 | } | 765 | } |
| 767 | 766 | ||
| 768 | index = name->hash >> (32 - ip->i_di.di_depth); | 767 | index = name->hash >> (32 - ip->i_di.di_depth); |
| 769 | error = get_first_leaf(ip, index, &bh); | 768 | error = get_first_leaf(ip, index, &bh); |
| 770 | if (error) | 769 | if (error) |
| @@ -779,14 +778,14 @@ static struct gfs2_dirent *gfs2_dirent_search(struct inode *inode, | |||
| 779 | brelse(bh); | 778 | brelse(bh); |
| 780 | if (!ln) | 779 | if (!ln) |
| 781 | break; | 780 | break; |
| 782 | 781 | ||
| 783 | error = get_leaf(ip, ln, &bh); | 782 | error = get_leaf(ip, ln, &bh); |
| 784 | } while(!error); | 783 | } while(!error); |
| 785 | 784 | ||
| 786 | return error ? ERR_PTR(error) : NULL; | 785 | return error ? ERR_PTR(error) : NULL; |
| 787 | } | 786 | } |
| 788 | 787 | ||
| 789 | 788 | ||
| 790 | error = gfs2_meta_inode_buffer(ip, &bh); | 789 | error = gfs2_meta_inode_buffer(ip, &bh); |
| 791 | if (error) | 790 | if (error) |
| 792 | return ERR_PTR(error); | 791 | return ERR_PTR(error); |
| @@ -810,7 +809,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, | |||
| 810 | struct qstr name = { .name = "", .len = 0, .hash = 0 }; | 809 | struct qstr name = { .name = "", .len = 0, .hash = 0 }; |
| 811 | if (!bh) | 810 | if (!bh) |
| 812 | return NULL; | 811 | return NULL; |
| 813 | 812 | ||
| 814 | gfs2_trans_add_bh(ip->i_gl, bh, 1); | 813 | gfs2_trans_add_bh(ip->i_gl, bh, 1); |
| 815 | gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF); | 814 | gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF); |
| 816 | leaf = (struct gfs2_leaf *)bh->b_data; | 815 | leaf = (struct gfs2_leaf *)bh->b_data; |
diff --git a/fs/gfs2/eaops.c b/fs/gfs2/eaops.c index 1a7877fe7393..92c54e9b0dc3 100644 --- a/fs/gfs2/eaops.c +++ b/fs/gfs2/eaops.c | |||
| @@ -146,7 +146,7 @@ static int system_eo_set(struct gfs2_inode *ip, struct gfs2_ea_request *er) | |||
| 146 | if (error == -ENODATA) | 146 | if (error == -ENODATA) |
| 147 | error = 0; | 147 | error = 0; |
| 148 | } | 148 | } |
| 149 | return error; | 149 | return error; |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | return -EPERM; | 152 | return -EPERM; |
diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c index bd5ca602f9f0..a65a4ccfd4dd 100644 --- a/fs/gfs2/eattr.c +++ b/fs/gfs2/eattr.c | |||
| @@ -1133,7 +1133,7 @@ static int ea_remove_stuffed(struct gfs2_inode *ip, struct gfs2_ea_location *el) | |||
| 1133 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); | 1133 | gfs2_trans_add_bh(ip->i_gl, dibh, 1); |
| 1134 | gfs2_dinode_out(&ip->i_di, dibh->b_data); | 1134 | gfs2_dinode_out(&ip->i_di, dibh->b_data); |
| 1135 | brelse(dibh); | 1135 | brelse(dibh); |
| 1136 | } | 1136 | } |
| 1137 | 1137 | ||
| 1138 | gfs2_trans_end(GFS2_SB(&ip->i_inode)); | 1138 | gfs2_trans_end(GFS2_SB(&ip->i_inode)); |
| 1139 | 1139 | ||
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index f98694e7d668..78fe0fae23ff 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
| @@ -371,7 +371,7 @@ fail_aspace: | |||
| 371 | if (gl->gl_aspace) | 371 | if (gl->gl_aspace) |
| 372 | gfs2_aspace_put(gl->gl_aspace); | 372 | gfs2_aspace_put(gl->gl_aspace); |
| 373 | fail: | 373 | fail: |
| 374 | kmem_cache_free(gfs2_glock_cachep, gl); | 374 | kmem_cache_free(gfs2_glock_cachep, gl); |
| 375 | return error; | 375 | return error; |
| 376 | } | 376 | } |
| 377 | 377 | ||
| @@ -614,7 +614,7 @@ static int rq_greedy(struct gfs2_holder *gh) | |||
| 614 | gfs2_holder_uninit(gh); | 614 | gfs2_holder_uninit(gh); |
| 615 | kfree(container_of(gh, struct greedy, gr_gh)); | 615 | kfree(container_of(gh, struct greedy, gr_gh)); |
| 616 | 616 | ||
| 617 | spin_lock(&gl->gl_spin); | 617 | spin_lock(&gl->gl_spin); |
| 618 | 618 | ||
| 619 | return 0; | 619 | return 0; |
| 620 | } | 620 | } |
| @@ -1184,11 +1184,11 @@ static void add_to_queue(struct gfs2_holder *gh) | |||
| 1184 | if (existing) { | 1184 | if (existing) { |
| 1185 | print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip); | 1185 | print_symbol(KERN_WARNING "original: %s\n", existing->gh_ip); |
| 1186 | printk(KERN_INFO "pid : %d\n", existing->gh_owner->pid); | 1186 | printk(KERN_INFO "pid : %d\n", existing->gh_owner->pid); |
| 1187 | printk(KERN_INFO "lock type : %d lock state : %d\n", | 1187 | printk(KERN_INFO "lock type : %d lock state : %d\n", |
| 1188 | existing->gh_gl->gl_name.ln_type, existing->gh_gl->gl_state); | 1188 | existing->gh_gl->gl_name.ln_type, existing->gh_gl->gl_state); |
| 1189 | print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip); | 1189 | print_symbol(KERN_WARNING "new: %s\n", gh->gh_ip); |
| 1190 | printk(KERN_INFO "pid : %d\n", gh->gh_owner->pid); | 1190 | printk(KERN_INFO "pid : %d\n", gh->gh_owner->pid); |
| 1191 | printk(KERN_INFO "lock type : %d lock state : %d\n", | 1191 | printk(KERN_INFO "lock type : %d lock state : %d\n", |
| 1192 | gl->gl_name.ln_type, gl->gl_state); | 1192 | gl->gl_name.ln_type, gl->gl_state); |
| 1193 | BUG(); | 1193 | BUG(); |
| 1194 | } | 1194 | } |
| @@ -1203,7 +1203,7 @@ static void add_to_queue(struct gfs2_holder *gh) | |||
| 1203 | if (gh->gh_flags & LM_FLAG_PRIORITY) | 1203 | if (gh->gh_flags & LM_FLAG_PRIORITY) |
| 1204 | list_add(&gh->gh_list, &gl->gl_waiters3); | 1204 | list_add(&gh->gh_list, &gl->gl_waiters3); |
| 1205 | else | 1205 | else |
| 1206 | list_add_tail(&gh->gh_list, &gl->gl_waiters3); | 1206 | list_add_tail(&gh->gh_list, &gl->gl_waiters3); |
| 1207 | } | 1207 | } |
| 1208 | 1208 | ||
| 1209 | /** | 1209 | /** |
| @@ -2003,7 +2003,7 @@ void gfs2_gl_hash_clear(struct gfs2_sbd *sdp, int wait) | |||
| 2003 | for (;;) { | 2003 | for (;;) { |
| 2004 | cont = 0; | 2004 | cont = 0; |
| 2005 | for (x = 0; x < GFS2_GL_HASH_SIZE; x++) { | 2005 | for (x = 0; x < GFS2_GL_HASH_SIZE; x++) { |
| 2006 | if (examine_bucket(clear_glock, sdp, x)) | 2006 | if (examine_bucket(clear_glock, sdp, x)) |
| 2007 | cont = 1; | 2007 | cont = 1; |
| 2008 | } | 2008 | } |
| 2009 | 2009 | ||
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b9e4bcb3bf1e..ac9535be304f 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
| @@ -386,7 +386,6 @@ struct inode *gfs2_lookup_simple(struct inode *dip, const char *name) | |||
| 386 | 386 | ||
| 387 | struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, | 387 | struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, |
| 388 | int is_root, struct nameidata *nd) | 388 | int is_root, struct nameidata *nd) |
| 389 | |||
| 390 | { | 389 | { |
| 391 | struct super_block *sb = dir->i_sb; | 390 | struct super_block *sb = dir->i_sb; |
| 392 | struct gfs2_inode *dip = GFS2_I(dir); | 391 | struct gfs2_inode *dip = GFS2_I(dir); |
| @@ -491,7 +490,7 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, u64 *formal_ino) | |||
| 491 | error = gfs2_meta_inode_buffer(ip, &bh); | 490 | error = gfs2_meta_inode_buffer(ip, &bh); |
| 492 | if (error) | 491 | if (error) |
| 493 | goto out_end_trans; | 492 | goto out_end_trans; |
| 494 | 493 | ||
| 495 | gfs2_inum_range_in(&ir, bh->b_data + sizeof(struct gfs2_dinode)); | 494 | gfs2_inum_range_in(&ir, bh->b_data + sizeof(struct gfs2_dinode)); |
| 496 | 495 | ||
| 497 | if (!ir.ir_length) { | 496 | if (!ir.ir_length) { |
| @@ -769,7 +768,7 @@ static int link_dinode(struct gfs2_inode *dip, const struct qstr *name, | |||
| 769 | 768 | ||
| 770 | error = gfs2_trans_begin(sdp, sdp->sd_max_dirres + | 769 | error = gfs2_trans_begin(sdp, sdp->sd_max_dirres + |
| 771 | al->al_rgd->rd_ri.ri_length + | 770 | al->al_rgd->rd_ri.ri_length + |
| 772 | 2 * RES_DINODE + | 771 | 2 * RES_DINODE + |
| 773 | RES_STATFS + RES_QUOTA, 0); | 772 | RES_STATFS + RES_QUOTA, 0); |
| 774 | if (error) | 773 | if (error) |
| 775 | goto fail_ipreserv; | 774 | goto fail_ipreserv; |
diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 32015d89f249..f5d861760579 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h | |||
| @@ -34,7 +34,7 @@ int gfs2_inode_refresh(struct gfs2_inode *ip); | |||
| 34 | 34 | ||
| 35 | int gfs2_dinode_dealloc(struct gfs2_inode *inode); | 35 | int gfs2_dinode_dealloc(struct gfs2_inode *inode); |
| 36 | int gfs2_change_nlink(struct gfs2_inode *ip, int diff); | 36 | int gfs2_change_nlink(struct gfs2_inode *ip, int diff); |
| 37 | struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, | 37 | struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, |
| 38 | int is_root, struct nameidata *nd); | 38 | int is_root, struct nameidata *nd); |
| 39 | struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, | 39 | struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, |
| 40 | unsigned int mode); | 40 | unsigned int mode); |
diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c index 2109fc4791d4..effe4a337c1d 100644 --- a/fs/gfs2/lm.c +++ b/fs/gfs2/lm.c | |||
| @@ -106,7 +106,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) | |||
| 106 | 106 | ||
| 107 | fs_err(sdp, "about to withdraw from the cluster\n"); | 107 | fs_err(sdp, "about to withdraw from the cluster\n"); |
| 108 | BUG_ON(sdp->sd_args.ar_debug); | 108 | BUG_ON(sdp->sd_args.ar_debug); |
| 109 | 109 | ||
| 110 | 110 | ||
| 111 | fs_err(sdp, "waiting for outstanding I/O\n"); | 111 | fs_err(sdp, "waiting for outstanding I/O\n"); |
| 112 | 112 | ||
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c index 554bf882a4c2..9cf1f168eaf8 100644 --- a/fs/gfs2/locking/dlm/thread.c +++ b/fs/gfs2/locking/dlm/thread.c | |||
| @@ -54,7 +54,7 @@ static void process_complete(struct gdlm_lock *lp) | |||
| 54 | 54 | ||
| 55 | if (lp->lksb.sb_status == -DLM_ECANCEL) { | 55 | if (lp->lksb.sb_status == -DLM_ECANCEL) { |
| 56 | log_info("complete dlm cancel %x,%llx flags %lx", | 56 | log_info("complete dlm cancel %x,%llx flags %lx", |
| 57 | lp->lockname.ln_type, | 57 | lp->lockname.ln_type, |
| 58 | (unsigned long long)lp->lockname.ln_number, | 58 | (unsigned long long)lp->lockname.ln_number, |
| 59 | lp->flags); | 59 | lp->flags); |
| 60 | 60 | ||
| @@ -102,7 +102,7 @@ static void process_complete(struct gdlm_lock *lp) | |||
| 102 | 102 | ||
| 103 | if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) { | 103 | if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) { |
| 104 | log_info("complete internal cancel %x,%llx", | 104 | log_info("complete internal cancel %x,%llx", |
| 105 | lp->lockname.ln_type, | 105 | lp->lockname.ln_type, |
| 106 | (unsigned long long)lp->lockname.ln_number); | 106 | (unsigned long long)lp->lockname.ln_number); |
| 107 | lp->req = lp->cur; | 107 | lp->req = lp->cur; |
| 108 | acb.lc_ret |= LM_OUT_CANCELED; | 108 | acb.lc_ret |= LM_OUT_CANCELED; |
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 2a98cbe3290f..881e337b6a70 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c | |||
| @@ -420,7 +420,7 @@ static void rg_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le) | |||
| 420 | gfs2_log_lock(sdp); | 420 | gfs2_log_lock(sdp); |
| 421 | sdp->sd_log_num_rg++; | 421 | sdp->sd_log_num_rg++; |
| 422 | list_add(&le->le_list, &sdp->sd_log_le_rg); | 422 | list_add(&le->le_list, &sdp->sd_log_le_rg); |
| 423 | gfs2_log_unlock(sdp); | 423 | gfs2_log_unlock(sdp); |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | static void rg_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai) | 426 | static void rg_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_ail *ai) |
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index 7903be735fe9..21508a13bb78 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c | |||
| @@ -77,7 +77,7 @@ static int __init init_gfs2_fs(void) | |||
| 77 | error = -ENOMEM; | 77 | error = -ENOMEM; |
| 78 | gfs2_glock_cachep = kmem_cache_create("gfs2_glock", | 78 | gfs2_glock_cachep = kmem_cache_create("gfs2_glock", |
| 79 | sizeof(struct gfs2_glock), | 79 | sizeof(struct gfs2_glock), |
| 80 | 0, 0, | 80 | 0, 0, |
| 81 | gfs2_init_glock_once, NULL); | 81 | gfs2_init_glock_once, NULL); |
| 82 | if (!gfs2_glock_cachep) | 82 | if (!gfs2_glock_cachep) |
| 83 | goto fail; | 83 | goto fail; |
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 8b18e974fa4d..811f4ada2a01 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
| @@ -296,7 +296,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping, | |||
| 296 | LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh); | 296 | LM_FLAG_TRY_1CB|GL_ATIME|GL_AOP, &gh); |
| 297 | do_unlock = 1; | 297 | do_unlock = 1; |
| 298 | ret = gfs2_glock_nq_m_atime(1, &gh); | 298 | ret = gfs2_glock_nq_m_atime(1, &gh); |
| 299 | if (ret == GLR_TRYFAILED) | 299 | if (ret == GLR_TRYFAILED) |
| 300 | goto out_noerror; | 300 | goto out_noerror; |
| 301 | if (unlikely(ret)) | 301 | if (unlikely(ret)) |
| 302 | goto out_unlock; | 302 | goto out_unlock; |
| @@ -681,7 +681,7 @@ static unsigned limit = 0; | |||
| 681 | 681 | ||
| 682 | gl = bd->bd_gl; | 682 | gl = bd->bd_gl; |
| 683 | 683 | ||
| 684 | fs_warn(sdp, "gl = (%u, %llu)\n", | 684 | fs_warn(sdp, "gl = (%u, %llu)\n", |
| 685 | gl->gl_name.ln_type, (unsigned long long)gl->gl_name.ln_number); | 685 | gl->gl_name.ln_type, (unsigned long long)gl->gl_name.ln_number); |
| 686 | 686 | ||
| 687 | fs_warn(sdp, "bd_list_tr = %s, bd_le.le_list = %s\n", | 687 | fs_warn(sdp, "bd_list_tr = %s, bd_le.le_list = %s\n", |
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c index 372dbcb3f7f3..a9ac1358ce21 100644 --- a/fs/gfs2/ops_file.c +++ b/fs/gfs2/ops_file.c | |||
| @@ -236,7 +236,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) | |||
| 236 | error = gfs2_glock_nq_m_atime(1, &gh); | 236 | error = gfs2_glock_nq_m_atime(1, &gh); |
| 237 | if (error) | 237 | if (error) |
| 238 | return error; | 238 | return error; |
| 239 | 239 | ||
| 240 | iflags = iflags_cvt(gfs2_to_iflags, ip->i_di.di_flags); | 240 | iflags = iflags_cvt(gfs2_to_iflags, ip->i_di.di_flags); |
| 241 | if (put_user(iflags, ptr)) | 241 | if (put_user(iflags, ptr)) |
| 242 | error = -EFAULT; | 242 | error = -EFAULT; |
| @@ -299,7 +299,7 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) | |||
| 299 | goto out; | 299 | goto out; |
| 300 | if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY)) | 300 | if (IS_APPEND(inode) && (new_flags & GFS2_DIF_APPENDONLY)) |
| 301 | goto out; | 301 | goto out; |
| 302 | if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) && | 302 | if (((new_flags ^ flags) & GFS2_DIF_IMMUTABLE) && |
| 303 | !capable(CAP_LINUX_IMMUTABLE)) | 303 | !capable(CAP_LINUX_IMMUTABLE)) |
| 304 | goto out; | 304 | goto out; |
| 305 | if (!IS_IMMUTABLE(inode)) { | 305 | if (!IS_IMMUTABLE(inode)) { |
| @@ -541,7 +541,7 @@ static int do_flock(struct file *file, int cmd, struct file_lock *fl) | |||
| 541 | goto out; | 541 | goto out; |
| 542 | gfs2_glock_hold(gl); | 542 | gfs2_glock_hold(gl); |
| 543 | flock_lock_file_wait(file, | 543 | flock_lock_file_wait(file, |
| 544 | &(struct file_lock){.fl_type = F_UNLCK}); | 544 | &(struct file_lock){.fl_type = F_UNLCK}); |
| 545 | gfs2_glock_dq_uninit(fl_gh); | 545 | gfs2_glock_dq_uninit(fl_gh); |
| 546 | } else { | 546 | } else { |
| 547 | error = gfs2_glock_get(GFS2_SB(&ip->i_inode), | 547 | error = gfs2_glock_get(GFS2_SB(&ip->i_inode), |
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index e32a6b242e0c..a9aa2edd756f 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
| @@ -146,7 +146,7 @@ static int init_names(struct gfs2_sbd *sdp, int silent) | |||
| 146 | brelse(bh); | 146 | brelse(bh); |
| 147 | return -ENOMEM; | 147 | return -ENOMEM; |
| 148 | } | 148 | } |
| 149 | gfs2_sb_in(sb, bh->b_data); | 149 | gfs2_sb_in(sb, bh->b_data); |
| 150 | brelse(bh); | 150 | brelse(bh); |
| 151 | 151 | ||
| 152 | error = gfs2_check_sb(sdp, sb, silent); | 152 | error = gfs2_check_sb(sdp, sb, silent); |
| @@ -272,7 +272,7 @@ static int init_sb(struct gfs2_sbd *sdp, int silent, int undo) | |||
| 272 | } | 272 | } |
| 273 | return 0; | 273 | return 0; |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | error = gfs2_glock_nq_num(sdp, GFS2_SB_LOCK, &gfs2_meta_glops, | 276 | error = gfs2_glock_nq_num(sdp, GFS2_SB_LOCK, &gfs2_meta_glops, |
| 277 | LM_ST_SHARED, 0, &sb_gh); | 277 | LM_ST_SHARED, 0, &sb_gh); |
| 278 | if (error) { | 278 | if (error) { |
| @@ -358,7 +358,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo) | |||
| 358 | error = -EINVAL; | 358 | error = -EINVAL; |
| 359 | if (!gfs2_jindex_size(sdp)) { | 359 | if (!gfs2_jindex_size(sdp)) { |
| 360 | fs_err(sdp, "no journals!\n"); | 360 | fs_err(sdp, "no journals!\n"); |
| 361 | goto fail_jindex; | 361 | goto fail_jindex; |
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | if (sdp->sd_args.ar_spectator) { | 364 | if (sdp->sd_args.ar_spectator) { |
| @@ -789,7 +789,7 @@ out: | |||
| 789 | return error; | 789 | return error; |
| 790 | } | 790 | } |
| 791 | 791 | ||
| 792 | static int fill_super_meta(struct super_block *sb, struct super_block *new, | 792 | static int fill_super_meta(struct super_block *sb, struct super_block *new, |
| 793 | void *data, int silent) | 793 | void *data, int silent) |
| 794 | { | 794 | { |
| 795 | struct gfs2_sbd *sdp = sb->s_fs_info; | 795 | struct gfs2_sbd *sdp = sb->s_fs_info; |
| @@ -821,7 +821,7 @@ static int set_bdev_super(struct super_block *s, void *data) | |||
| 821 | s->s_dev = s->s_bdev->bd_dev; | 821 | s->s_dev = s->s_bdev->bd_dev; |
| 822 | return 0; | 822 | return 0; |
| 823 | } | 823 | } |
| 824 | 824 | ||
| 825 | static int test_bdev_super(struct super_block *s, void *data) | 825 | static int test_bdev_super(struct super_block *s, void *data) |
| 826 | { | 826 | { |
| 827 | return s->s_bdev == data; | 827 | return s->s_bdev == data; |
| @@ -835,10 +835,10 @@ static struct super_block* get_gfs2_sb(const char *dev_name) | |||
| 835 | struct super_block *sb = NULL, *s; | 835 | struct super_block *sb = NULL, *s; |
| 836 | struct list_head *l; | 836 | struct list_head *l; |
| 837 | int error; | 837 | int error; |
| 838 | 838 | ||
| 839 | error = path_lookup(dev_name, LOOKUP_FOLLOW, &nd); | 839 | error = path_lookup(dev_name, LOOKUP_FOLLOW, &nd); |
| 840 | if (error) { | 840 | if (error) { |
| 841 | printk(KERN_WARNING "GFS2: path_lookup on %s returned error\n", | 841 | printk(KERN_WARNING "GFS2: path_lookup on %s returned error\n", |
| 842 | dev_name); | 842 | dev_name); |
| 843 | goto out; | 843 | goto out; |
| 844 | } | 844 | } |
| @@ -900,9 +900,9 @@ static int gfs2_get_sb_meta(struct file_system_type *fs_type, int flags, | |||
| 900 | deactivate_super(new); | 900 | deactivate_super(new); |
| 901 | goto error; | 901 | goto error; |
| 902 | } | 902 | } |
| 903 | 903 | ||
| 904 | new->s_flags |= MS_ACTIVE; | 904 | new->s_flags |= MS_ACTIVE; |
| 905 | 905 | ||
| 906 | /* Grab a reference to the gfs2 mount point */ | 906 | /* Grab a reference to the gfs2 mount point */ |
| 907 | atomic_inc(&sdp->sd_gfs2mnt->mnt_count); | 907 | atomic_inc(&sdp->sd_gfs2mnt->mnt_count); |
| 908 | return simple_set_mnt(mnt, new); | 908 | return simple_set_mnt(mnt, new); |
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index bb2ef6a86533..57af0192b241 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c | |||
| @@ -522,7 +522,7 @@ static int gfs2_mknod(struct inode *dir, struct dentry *dentry, int mode, | |||
| 522 | case S_IFSOCK: | 522 | case S_IFSOCK: |
| 523 | break; | 523 | break; |
| 524 | default: | 524 | default: |
| 525 | return -EOPNOTSUPP; | 525 | return -EOPNOTSUPP; |
| 526 | }; | 526 | }; |
| 527 | 527 | ||
| 528 | gfs2_holder_init(dip->i_gl, 0, 0, ghs); | 528 | gfs2_holder_init(dip->i_gl, 0, 0, ghs); |
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c index f9538849c418..8cfda6452139 100644 --- a/fs/gfs2/ops_super.c +++ b/fs/gfs2/ops_super.c | |||
| @@ -367,7 +367,7 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt) | |||
| 367 | return 0; | 367 | return 0; |
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | /* | 370 | /* |
| 371 | * We have to (at the moment) hold the inodes main lock to cover | 371 | * We have to (at the moment) hold the inodes main lock to cover |
| 372 | * the gap between unlocking the shared lock on the iopen lock and | 372 | * the gap between unlocking the shared lock on the iopen lock and |
| 373 | * taking the exclusive lock. I'd rather do a shared -> exclusive | 373 | * taking the exclusive lock. I'd rather do a shared -> exclusive |
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index da46e14388f4..c0a3c9a2a593 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c | |||
| @@ -556,7 +556,7 @@ static void do_qc(struct gfs2_quota_data *qd, s64 change) | |||
| 556 | qd_hold(qd); | 556 | qd_hold(qd); |
| 557 | slot_hold(qd); | 557 | slot_hold(qd); |
| 558 | } | 558 | } |
| 559 | 559 | ||
| 560 | mutex_unlock(&sdp->sd_quota_mutex); | 560 | mutex_unlock(&sdp->sd_quota_mutex); |
| 561 | } | 561 | } |
| 562 | 562 | ||
| @@ -777,7 +777,7 @@ restart: | |||
| 777 | 777 | ||
| 778 | gfs2_glock_dq_uninit(&i_gh); | 778 | gfs2_glock_dq_uninit(&i_gh); |
| 779 | 779 | ||
| 780 | 780 | ||
| 781 | gfs2_quota_in(&q, buf); | 781 | gfs2_quota_in(&q, buf); |
| 782 | qlvb = (struct gfs2_quota_lvb *)qd->qd_gl->gl_lvb; | 782 | qlvb = (struct gfs2_quota_lvb *)qd->qd_gl->gl_lvb; |
| 783 | qlvb->qb_magic = cpu_to_be32(GFS2_MAGIC); | 783 | qlvb->qb_magic = cpu_to_be32(GFS2_MAGIC); |
| @@ -1062,7 +1062,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) | |||
| 1062 | if (!ip->i_di.di_size || ip->i_di.di_size > (64 << 20) || | 1062 | if (!ip->i_di.di_size || ip->i_di.di_size > (64 << 20) || |
| 1063 | ip->i_di.di_size & (sdp->sd_sb.sb_bsize - 1)) { | 1063 | ip->i_di.di_size & (sdp->sd_sb.sb_bsize - 1)) { |
| 1064 | gfs2_consist_inode(ip); | 1064 | gfs2_consist_inode(ip); |
| 1065 | return -EIO; | 1065 | return -EIO; |
| 1066 | } | 1066 | } |
| 1067 | sdp->sd_quota_slots = blocks * sdp->sd_qc_per_block; | 1067 | sdp->sd_quota_slots = blocks * sdp->sd_qc_per_block; |
| 1068 | sdp->sd_quota_chunks = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * PAGE_SIZE); | 1068 | sdp->sd_quota_chunks = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * PAGE_SIZE); |
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c index 4d4ea7e66edc..0a8a4b87dcc6 100644 --- a/fs/gfs2/recovery.c +++ b/fs/gfs2/recovery.c | |||
| @@ -444,11 +444,11 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd) | |||
| 444 | switch (error) { | 444 | switch (error) { |
| 445 | case 0: | 445 | case 0: |
| 446 | break; | 446 | break; |
| 447 | 447 | ||
| 448 | case GLR_TRYFAILED: | 448 | case GLR_TRYFAILED: |
| 449 | fs_info(sdp, "jid=%u: Busy\n", jd->jd_jid); | 449 | fs_info(sdp, "jid=%u: Busy\n", jd->jd_jid); |
| 450 | error = 0; | 450 | error = 0; |
| 451 | 451 | ||
| 452 | default: | 452 | default: |
| 453 | goto fail; | 453 | goto fail; |
| 454 | }; | 454 | }; |
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 5f8e225c5497..b261385c0065 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
| @@ -896,7 +896,7 @@ static int get_local_rgrp(struct gfs2_inode *ip) | |||
| 896 | rgd = recent_rgrp_first(sdp, ip->i_last_rg_alloc); | 896 | rgd = recent_rgrp_first(sdp, ip->i_last_rg_alloc); |
| 897 | 897 | ||
| 898 | while (rgd) { | 898 | while (rgd) { |
| 899 | error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, | 899 | error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, |
| 900 | LM_FLAG_TRY, &al->al_rgd_gh); | 900 | LM_FLAG_TRY, &al->al_rgd_gh); |
| 901 | switch (error) { | 901 | switch (error) { |
| 902 | case 0: | 902 | case 0: |
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index fe207a3e206e..f6ce5e4eaf7e 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
| @@ -650,8 +650,7 @@ void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free, | |||
| 650 | l_sc->sc_total += total; | 650 | l_sc->sc_total += total; |
| 651 | l_sc->sc_free += free; | 651 | l_sc->sc_free += free; |
| 652 | l_sc->sc_dinodes += dinodes; | 652 | l_sc->sc_dinodes += dinodes; |
| 653 | gfs2_statfs_change_out(l_sc, l_bh->b_data + | 653 | gfs2_statfs_change_out(l_sc, l_bh->b_data + sizeof(struct gfs2_dinode)); |
| 654 | sizeof(struct gfs2_dinode)); | ||
| 655 | spin_unlock(&sdp->sd_statfs_spin); | 654 | spin_unlock(&sdp->sd_statfs_spin); |
| 656 | 655 | ||
| 657 | brelse(l_bh); | 656 | brelse(l_bh); |
| @@ -678,7 +677,7 @@ int gfs2_statfs_sync(struct gfs2_sbd *sdp) | |||
| 678 | 677 | ||
| 679 | spin_lock(&sdp->sd_statfs_spin); | 678 | spin_lock(&sdp->sd_statfs_spin); |
| 680 | gfs2_statfs_change_in(m_sc, m_bh->b_data + | 679 | gfs2_statfs_change_in(m_sc, m_bh->b_data + |
| 681 | sizeof(struct gfs2_dinode)); | 680 | sizeof(struct gfs2_dinode)); |
| 682 | if (!l_sc->sc_total && !l_sc->sc_free && !l_sc->sc_dinodes) { | 681 | if (!l_sc->sc_total && !l_sc->sc_free && !l_sc->sc_dinodes) { |
| 683 | spin_unlock(&sdp->sd_statfs_spin); | 682 | spin_unlock(&sdp->sd_statfs_spin); |
| 684 | goto out_bh; | 683 | goto out_bh; |
