diff options
Diffstat (limited to 'fs/gfs2/ops_address.c')
-rw-r--r-- | fs/gfs2/ops_address.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index 2f7ef980d029..8676c39d0d73 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c | |||
@@ -217,7 +217,7 @@ static int gfs2_readpage(struct file *file, struct page *page) | |||
217 | } | 217 | } |
218 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|LM_FLAG_TRY_1CB, &gh); | 218 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME|LM_FLAG_TRY_1CB, &gh); |
219 | do_unlock = 1; | 219 | do_unlock = 1; |
220 | error = gfs2_glock_nq_m_atime(1, &gh); | 220 | error = gfs2_glock_nq_atime(&gh); |
221 | if (unlikely(error)) | 221 | if (unlikely(error)) |
222 | goto out_unlock; | 222 | goto out_unlock; |
223 | } | 223 | } |
@@ -282,7 +282,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping, | |||
282 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, | 282 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, |
283 | LM_FLAG_TRY_1CB|GL_ATIME, &gh); | 283 | LM_FLAG_TRY_1CB|GL_ATIME, &gh); |
284 | do_unlock = 1; | 284 | do_unlock = 1; |
285 | ret = gfs2_glock_nq_m_atime(1, &gh); | 285 | ret = gfs2_glock_nq_atime(&gh); |
286 | if (ret == GLR_TRYFAILED) | 286 | if (ret == GLR_TRYFAILED) |
287 | goto out_noerror; | 287 | goto out_noerror; |
288 | if (unlikely(ret)) | 288 | if (unlikely(ret)) |
@@ -354,7 +354,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page, | |||
354 | 354 | ||
355 | 355 | ||
356 | gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME|LM_FLAG_TRY_1CB, &ip->i_gh); | 356 | gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME|LM_FLAG_TRY_1CB, &ip->i_gh); |
357 | error = gfs2_glock_nq_m_atime(1, &ip->i_gh); | 357 | error = gfs2_glock_nq_atime(&ip->i_gh); |
358 | if (unlikely(error)) { | 358 | if (unlikely(error)) { |
359 | if (error == GLR_TRYFAILED) | 359 | if (error == GLR_TRYFAILED) |
360 | error = AOP_TRUNCATED_PAGE; | 360 | error = AOP_TRUNCATED_PAGE; |
@@ -609,7 +609,7 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb, | |||
609 | * on this path. All we need change is atime. | 609 | * on this path. All we need change is atime. |
610 | */ | 610 | */ |
611 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh); | 611 | gfs2_holder_init(ip->i_gl, LM_ST_SHARED, GL_ATIME, &gh); |
612 | rv = gfs2_glock_nq_m_atime(1, &gh); | 612 | rv = gfs2_glock_nq_atime(&gh); |
613 | if (rv) | 613 | if (rv) |
614 | goto out; | 614 | goto out; |
615 | 615 | ||