From 31b805cddded96c6a490668c629ba6eb34e4c312 Mon Sep 17 00:00:00 2001
From: Brian Foster <bfoster@redhat.com>
Date: Mon, 16 Jul 2012 15:23:50 -0400
Subject: [PATCH] --- yaml --- r: 321680 b: refs/heads/master c:
 a8894274a3581125fb311eabfc97cd0123740c5e h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/fuse/file.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 35868237b7b7..ea7775804e5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eed2179efe1aac145bf6d54b925b750976380fa6
+refs/heads/master: a8894274a3581125fb311eabfc97cd0123740c5e
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index b321a688cde7..5800101e5ce1 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -703,13 +703,16 @@ static ssize_t fuse_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 				  unsigned long nr_segs, loff_t pos)
 {
 	struct inode *inode = iocb->ki_filp->f_mapping->host;
+	struct fuse_conn *fc = get_fuse_conn(inode);
 
-	if (pos + iov_length(iov, nr_segs) > i_size_read(inode)) {
+	/*
+	 * In auto invalidate mode, always update attributes on read.
+	 * Otherwise, only update if we attempt to read past EOF (to ensure
+	 * i_size is up to date).
+	 */
+	if (fc->auto_inval_data ||
+	    (pos + iov_length(iov, nr_segs) > i_size_read(inode))) {
 		int err;
-		/*
-		 * If trying to read past EOF, make sure the i_size
-		 * attribute is up-to-date.
-		 */
 		err = fuse_update_attributes(inode, NULL, iocb->ki_filp, NULL);
 		if (err)
 			return err;