diff options
Diffstat (limited to 'fs/gfs2/ops_address.c')
-rw-r--r-- | fs/gfs2/ops_address.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index c719a2a40698..8f839120a473 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
@@ -166,7 +166,6 @@ static int gfs2_writepage(struct page *page, struct writeback_control *wbc) | |||
166 | int error; | 166 | int error; |
167 | int done_trans = 0; | 167 | int done_trans = 0; |
168 | 168 | ||
169 | atomic_inc(&sdp->sd_ops_address); | ||
170 | if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl))) { | 169 | if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl))) { |
171 | unlock_page(page); | 170 | unlock_page(page); |
172 | return -EIO; | 171 | return -EIO; |
@@ -265,8 +264,6 @@ static int gfs2_readpage(struct file *file, struct page *page) | |||
265 | struct gfs2_holder gh; | 264 | struct gfs2_holder gh; |
266 | int error; | 265 | int error; |
267 | 266 | ||
268 | atomic_inc(&sdp->sd_ops_address); | ||
269 | |||
270 | if (file != &gfs2_internal_file_sentinal) { | 267 | if (file != &gfs2_internal_file_sentinal) { |
271 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh); | 268 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh); |
272 | error = gfs2_glock_nq_m_atime(1, &gh); | 269 | error = gfs2_glock_nq_m_atime(1, &gh); |
@@ -319,8 +316,6 @@ static int gfs2_prepare_write(struct file *file, struct page *page, | |||
319 | loff_t end = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to; | 316 | loff_t end = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to; |
320 | struct gfs2_alloc *al; | 317 | struct gfs2_alloc *al; |
321 | 318 | ||
322 | atomic_inc(&sdp->sd_ops_address); | ||
323 | |||
324 | gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, &ip->i_gh); | 319 | gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME, &ip->i_gh); |
325 | error = gfs2_glock_nq_m_atime(1, &ip->i_gh); | 320 | error = gfs2_glock_nq_m_atime(1, &ip->i_gh); |
326 | if (error) | 321 | if (error) |
@@ -412,9 +407,6 @@ static int gfs2_commit_write(struct file *file, struct page *page, | |||
412 | struct buffer_head *dibh; | 407 | struct buffer_head *dibh; |
413 | struct gfs2_alloc *al = &ip->i_alloc;; | 408 | struct gfs2_alloc *al = &ip->i_alloc;; |
414 | 409 | ||
415 | atomic_inc(&sdp->sd_ops_address); | ||
416 | |||
417 | |||
418 | if (gfs2_assert_withdraw(sdp, gfs2_glock_is_locked_by_me(ip->i_gl))) | 410 | if (gfs2_assert_withdraw(sdp, gfs2_glock_is_locked_by_me(ip->i_gl))) |
419 | goto fail_nounlock; | 411 | goto fail_nounlock; |
420 | 412 | ||
@@ -493,8 +485,6 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock) | |||
493 | sector_t dblock = 0; | 485 | sector_t dblock = 0; |
494 | int error; | 486 | int error; |
495 | 487 | ||
496 | atomic_inc(&ip->i_sbd->sd_ops_address); | ||
497 | |||
498 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); | 488 | error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); |
499 | if (error) | 489 | if (error) |
500 | return 0; | 490 | return 0; |
@@ -615,8 +605,6 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb, | |||
615 | struct gfs2_inode *ip = get_v2ip(inode); | 605 | struct gfs2_inode *ip = get_v2ip(inode); |
616 | struct gfs2_sbd *sdp = ip->i_sbd; | 606 | struct gfs2_sbd *sdp = ip->i_sbd; |
617 | 607 | ||
618 | atomic_inc(&sdp->sd_ops_address); | ||
619 | |||
620 | if (rw == WRITE) | 608 | if (rw == WRITE) |
621 | return gfs2_direct_IO_write(iocb, iov, offset, nr_segs); | 609 | return gfs2_direct_IO_write(iocb, iov, offset, nr_segs); |
622 | 610 | ||