diff options
author | Junxiao Bi <junxiao.bi@oracle.com> | 2013-09-11 17:19:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:56:30 -0400 |
commit | f17c20dd2ec81e8ff328b81bc847da9429d0975b (patch) | |
tree | 288ff70d8c78e14f51dde033921ee0bc7072e4cd /fs/ocfs2/quota_local.c | |
parent | 2b1e55c389105b722cccadfa47f5615f57d8887f (diff) |
ocfs2: use i_size_read() to access i_size
Though ocfs2 uses inode->i_mutex to protect i_size, there are both
i_size_read/write() and direct accesses. Clean up all direct access to
eliminate confusion.
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Jie Liu <jeff.liu@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/quota_local.c')
-rw-r--r-- | fs/ocfs2/quota_local.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 27fe7ee4874c..2e4344be3b96 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c | |||
@@ -982,14 +982,14 @@ static struct ocfs2_quota_chunk *ocfs2_local_quota_add_chunk( | |||
982 | 982 | ||
983 | /* We are protected by dqio_sem so no locking needed */ | 983 | /* We are protected by dqio_sem so no locking needed */ |
984 | status = ocfs2_extend_no_holes(lqinode, NULL, | 984 | status = ocfs2_extend_no_holes(lqinode, NULL, |
985 | lqinode->i_size + 2 * sb->s_blocksize, | 985 | i_size_read(lqinode) + 2 * sb->s_blocksize, |
986 | lqinode->i_size); | 986 | i_size_read(lqinode)); |
987 | if (status < 0) { | 987 | if (status < 0) { |
988 | mlog_errno(status); | 988 | mlog_errno(status); |
989 | goto out; | 989 | goto out; |
990 | } | 990 | } |
991 | status = ocfs2_simple_size_update(lqinode, oinfo->dqi_lqi_bh, | 991 | status = ocfs2_simple_size_update(lqinode, oinfo->dqi_lqi_bh, |
992 | lqinode->i_size + 2 * sb->s_blocksize); | 992 | i_size_read(lqinode) + 2 * sb->s_blocksize); |
993 | if (status < 0) { | 993 | if (status < 0) { |
994 | mlog_errno(status); | 994 | mlog_errno(status); |
995 | goto out; | 995 | goto out; |
@@ -1125,14 +1125,14 @@ static struct ocfs2_quota_chunk *ocfs2_extend_local_quota_file( | |||
1125 | 1125 | ||
1126 | /* We are protected by dqio_sem so no locking needed */ | 1126 | /* We are protected by dqio_sem so no locking needed */ |
1127 | status = ocfs2_extend_no_holes(lqinode, NULL, | 1127 | status = ocfs2_extend_no_holes(lqinode, NULL, |
1128 | lqinode->i_size + sb->s_blocksize, | 1128 | i_size_read(lqinode) + sb->s_blocksize, |
1129 | lqinode->i_size); | 1129 | i_size_read(lqinode)); |
1130 | if (status < 0) { | 1130 | if (status < 0) { |
1131 | mlog_errno(status); | 1131 | mlog_errno(status); |
1132 | goto out; | 1132 | goto out; |
1133 | } | 1133 | } |
1134 | status = ocfs2_simple_size_update(lqinode, oinfo->dqi_lqi_bh, | 1134 | status = ocfs2_simple_size_update(lqinode, oinfo->dqi_lqi_bh, |
1135 | lqinode->i_size + sb->s_blocksize); | 1135 | i_size_read(lqinode) + sb->s_blocksize); |
1136 | if (status < 0) { | 1136 | if (status < 0) { |
1137 | mlog_errno(status); | 1137 | mlog_errno(status); |
1138 | goto out; | 1138 | goto out; |