diff --git a/[refs] b/[refs]
index 573cf19ee520..55f1da67837c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a3c3a5120bff77cc8c3a70c7cb681f458f47bfd
+refs/heads/master: 8563000d3bf3ccfccce335c092a7c43078be8ffd
diff --git a/trunk/fs/ext4/file.c b/trunk/fs/ext4/file.c
index cb70f1812a70..8c7642a00054 100644
--- a/trunk/fs/ext4/file.c
+++ b/trunk/fs/ext4/file.c
@@ -95,7 +95,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
 {
 	struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
 	int unaligned_aio = 0;
-	int ret;
+	ssize_t ret;
 
 	/*
 	 * If we have encountered a bitmap-format file, the size limit