aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r--fs/ocfs2/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 584cf8ac167a..81296b4e3646 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1233,7 +1233,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
1233 } 1233 }
1234 1234
1235 /* 1235 /*
1236 * This will intentionally not wind up calling simple_setsize(), 1236 * This will intentionally not wind up calling truncate_setsize(),
1237 * since all the work for a size change has been done above. 1237 * since all the work for a size change has been done above.
1238 * Otherwise, we could get into problems with truncate as 1238 * Otherwise, we could get into problems with truncate as
1239 * ip_alloc_sem is used there to protect against i_size 1239 * ip_alloc_sem is used there to protect against i_size
@@ -2308,12 +2308,12 @@ relock:
2308 * blocks outside i_size. Trim these off again. 2308 * blocks outside i_size. Trim these off again.
2309 * Don't need i_size_read because we hold i_mutex. 2309 * Don't need i_size_read because we hold i_mutex.
2310 * 2310 *
2311 * XXX(hch): this looks buggy because ocfs2 did not 2311 * XXX(truncate): this looks buggy because ocfs2 did not
2312 * actually implement ->truncate. Take a look at 2312 * actually implement ->truncate. Take a look at
2313 * the new truncate sequence and update this accordingly 2313 * the new truncate sequence and update this accordingly
2314 */ 2314 */
2315 if (*ppos + count > inode->i_size) 2315 if (*ppos + count > inode->i_size)
2316 simple_setsize(inode, inode->i_size); 2316 truncate_setsize(inode, inode->i_size);
2317 ret = written; 2317 ret = written;
2318 goto out_dio; 2318 goto out_dio;
2319 } 2319 }