aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorRoel Kluin <12o3l@tiscali.nl>2008-04-29 22:01:18 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-04-29 22:01:18 -0400
commitf8a87d89304c1eea8e4a8dc02d134f57590913c6 (patch)
tree9d1e5179573a77259c13161a245f7a761e4a5091 /fs/ext4
parent7c2f3d6f89aab04c5c66a0a757888d3a77a5e899 (diff)
ext4: fix test ext_generic_write_end() copied return value
'copied' is unsigned, whereas 'ret2' is not. The test (copied < 0) fails Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/inode.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0c94db462c2f..8d9707746413 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1311,10 +1311,11 @@ static int ext4_ordered_write_end(struct file *file,
1311 new_i_size = pos + copied; 1311 new_i_size = pos + copied;
1312 if (new_i_size > EXT4_I(inode)->i_disksize) 1312 if (new_i_size > EXT4_I(inode)->i_disksize)
1313 EXT4_I(inode)->i_disksize = new_i_size; 1313 EXT4_I(inode)->i_disksize = new_i_size;
1314 copied = ext4_generic_write_end(file, mapping, pos, len, copied, 1314 ret2 = ext4_generic_write_end(file, mapping, pos, len, copied,
1315 page, fsdata); 1315 page, fsdata);
1316 if (copied < 0) 1316 copied = ret2;
1317 ret = copied; 1317 if (ret2 < 0)
1318 ret = ret2;
1318 } 1319 }
1319 ret2 = ext4_journal_stop(handle); 1320 ret2 = ext4_journal_stop(handle);
1320 if (!ret) 1321 if (!ret)
@@ -1339,10 +1340,11 @@ static int ext4_writeback_write_end(struct file *file,
1339 if (new_i_size > EXT4_I(inode)->i_disksize) 1340 if (new_i_size > EXT4_I(inode)->i_disksize)
1340 EXT4_I(inode)->i_disksize = new_i_size; 1341 EXT4_I(inode)->i_disksize = new_i_size;
1341 1342
1342 copied = ext4_generic_write_end(file, mapping, pos, len, copied, 1343 ret2 = ext4_generic_write_end(file, mapping, pos, len, copied,
1343 page, fsdata); 1344 page, fsdata);
1344 if (copied < 0) 1345 copied = ret2;
1345 ret = copied; 1346 if (ret2 < 0)
1347 ret = ret2;
1346 1348
1347 ret2 = ext4_journal_stop(handle); 1349 ret2 = ext4_journal_stop(handle);
1348 if (!ret) 1350 if (!ret)