diff options
Diffstat (limited to 'fs/ext2')
-rw-r--r-- | fs/ext2/inode.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 7dee7b3f3688..069620b30d4d 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -1156,15 +1156,10 @@ static void ext2_truncate_blocks(struct inode *inode, loff_t offset) | |||
1156 | __ext2_truncate_blocks(inode, offset); | 1156 | __ext2_truncate_blocks(inode, offset); |
1157 | } | 1157 | } |
1158 | 1158 | ||
1159 | int ext2_setsize(struct inode *inode, loff_t newsize) | 1159 | static int ext2_setsize(struct inode *inode, loff_t newsize) |
1160 | { | 1160 | { |
1161 | loff_t oldsize; | ||
1162 | int error; | 1161 | int error; |
1163 | 1162 | ||
1164 | error = inode_newsize_ok(inode, newsize); | ||
1165 | if (error) | ||
1166 | return error; | ||
1167 | |||
1168 | if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || | 1163 | if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || |
1169 | S_ISLNK(inode->i_mode))) | 1164 | S_ISLNK(inode->i_mode))) |
1170 | return -EINVAL; | 1165 | return -EINVAL; |
@@ -1184,10 +1179,7 @@ int ext2_setsize(struct inode *inode, loff_t newsize) | |||
1184 | if (error) | 1179 | if (error) |
1185 | return error; | 1180 | return error; |
1186 | 1181 | ||
1187 | oldsize = inode->i_size; | 1182 | truncate_setsize(inode, newsize); |
1188 | i_size_write(inode, newsize); | ||
1189 | truncate_pagecache(inode, oldsize, newsize); | ||
1190 | |||
1191 | __ext2_truncate_blocks(inode, newsize); | 1183 | __ext2_truncate_blocks(inode, newsize); |
1192 | 1184 | ||
1193 | inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC; | 1185 | inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC; |