diff options
Diffstat (limited to 'fs/gfs2/inode.c')
-rw-r--r-- | fs/gfs2/inode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 2a00b96eac01..30ca82a1addf 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c | |||
@@ -782,11 +782,11 @@ static int pick_formal_ino_1(struct gfs2_sbd *sdp, uint64_t *formal_ino) | |||
782 | error = gfs2_trans_begin(sdp, RES_DINODE, 0); | 782 | error = gfs2_trans_begin(sdp, RES_DINODE, 0); |
783 | if (error) | 783 | if (error) |
784 | return error; | 784 | return error; |
785 | down(&sdp->sd_inum_mutex); | 785 | mutex_lock(&sdp->sd_inum_mutex); |
786 | 786 | ||
787 | error = gfs2_meta_inode_buffer(ip, &bh); | 787 | error = gfs2_meta_inode_buffer(ip, &bh); |
788 | if (error) { | 788 | if (error) { |
789 | up(&sdp->sd_inum_mutex); | 789 | mutex_unlock(&sdp->sd_inum_mutex); |
790 | gfs2_trans_end(sdp); | 790 | gfs2_trans_end(sdp); |
791 | return error; | 791 | return error; |
792 | } | 792 | } |
@@ -800,14 +800,14 @@ static int pick_formal_ino_1(struct gfs2_sbd *sdp, uint64_t *formal_ino) | |||
800 | gfs2_inum_range_out(&ir, | 800 | gfs2_inum_range_out(&ir, |
801 | bh->b_data + sizeof(struct gfs2_dinode)); | 801 | bh->b_data + sizeof(struct gfs2_dinode)); |
802 | brelse(bh); | 802 | brelse(bh); |
803 | up(&sdp->sd_inum_mutex); | 803 | mutex_unlock(&sdp->sd_inum_mutex); |
804 | gfs2_trans_end(sdp); | 804 | gfs2_trans_end(sdp); |
805 | return 0; | 805 | return 0; |
806 | } | 806 | } |
807 | 807 | ||
808 | brelse(bh); | 808 | brelse(bh); |
809 | 809 | ||
810 | up(&sdp->sd_inum_mutex); | 810 | mutex_unlock(&sdp->sd_inum_mutex); |
811 | gfs2_trans_end(sdp); | 811 | gfs2_trans_end(sdp); |
812 | 812 | ||
813 | return 1; | 813 | return 1; |
@@ -829,7 +829,7 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, uint64_t *formal_ino) | |||
829 | error = gfs2_trans_begin(sdp, 2 * RES_DINODE, 0); | 829 | error = gfs2_trans_begin(sdp, 2 * RES_DINODE, 0); |
830 | if (error) | 830 | if (error) |
831 | goto out; | 831 | goto out; |
832 | down(&sdp->sd_inum_mutex); | 832 | mutex_lock(&sdp->sd_inum_mutex); |
833 | 833 | ||
834 | error = gfs2_meta_inode_buffer(ip, &bh); | 834 | error = gfs2_meta_inode_buffer(ip, &bh); |
835 | if (error) | 835 | if (error) |
@@ -869,7 +869,7 @@ static int pick_formal_ino_2(struct gfs2_sbd *sdp, uint64_t *formal_ino) | |||
869 | brelse(bh); | 869 | brelse(bh); |
870 | 870 | ||
871 | out_end_trans: | 871 | out_end_trans: |
872 | up(&sdp->sd_inum_mutex); | 872 | mutex_unlock(&sdp->sd_inum_mutex); |
873 | gfs2_trans_end(sdp); | 873 | gfs2_trans_end(sdp); |
874 | 874 | ||
875 | out: | 875 | out: |