From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 29 Jan 2008 20:05:57 +0000 (+0100)
Subject: splice: fix problem with atime not being updated
X-Git-Tag: v2.6.25-rc1~1149
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9e97198dbf318be7958b57900d05b37c7e09ad7c;p=linux-2.6-omap-h63xx.git

splice: fix problem with atime not being updated

A bug report on nfsd that states that since it was switched to use
splice instead of sendfile, the atime was no longer being updated
on the input file. do_generic_mapping_read() does this when accessing
the file, make splice do it for the direct splice handler.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/fs/splice.c b/fs/splice.c
index 0a0b79b01d0..1577a7391d2 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1031,7 +1031,11 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 			goto out_release;
 	}
 
+done:
 	pipe->nrbufs = pipe->curbuf = 0;
+	if (bytes > 0)
+		file_accessed(in);
+
 	return bytes;
 
 out_release:
@@ -1047,16 +1051,11 @@ out_release:
 			buf->ops = NULL;
 		}
 	}
-	pipe->nrbufs = pipe->curbuf = 0;
-
-	/*
-	 * If we transferred some data, return the number of bytes:
-	 */
-	if (bytes > 0)
-		return bytes;
 
-	return ret;
+	if (!bytes)
+		bytes = ret;
 
+	goto done;
 }
 EXPORT_SYMBOL(splice_direct_to_actor);