Patchwork ext4: use i_size_read in ext4_unaligned_aio()

login
register
mail settings
Submitter Theodore Ts'o
Date April 12, 2014, 4:46 p.m.
Message ID <1397321174-7605-1-git-send-email-tytso@mit.edu>
Download mbox | patch
Permalink /patch/338692/
State Awaiting Upstream
Headers show

Comments

Theodore Ts'o - April 12, 2014, 4:46 p.m.
We haven't taken i_mutex yet, so we need to use i_size_read().

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
---
 fs/ext4/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Zheng Liu - April 13, 2014, 8:10 a.m.
On Sat, Apr 12, 2014 at 12:46:14PM -0400, Theodore Ts'o wrote:
> We haven't taken i_mutex yet, so we need to use i_size_read().
> 
> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
> Cc: stable@vger.kernel.org

Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>

                                                - Zheng

> ---
>  fs/ext4/file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index 6db7f7d..bc76559 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -82,7 +82,7 @@ ext4_unaligned_aio(struct inode *inode, const struct iovec *iov,
>  	size_t count = iov_length(iov, nr_segs);
>  	loff_t final_size = pos + count;
>  
> -	if (pos >= inode->i_size)
> +	if (pos >= i_size_read(inode))
>  		return 0;
>  
>  	if ((pos & blockmask) || (final_size & blockmask))
> -- 
> 1.9.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 6db7f7d..bc76559 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -82,7 +82,7 @@  ext4_unaligned_aio(struct inode *inode, const struct iovec *iov,
 	size_t count = iov_length(iov, nr_segs);
 	loff_t final_size = pos + count;
 
-	if (pos >= inode->i_size)
+	if (pos >= i_size_read(inode))
 		return 0;
 
 	if ((pos & blockmask) || (final_size & blockmask))