diff options
| author | Tao Ma <tao.ma@oracle.com> | 2009-06-19 15:36:52 +0800 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-06-22 14:24:45 -0700 |
| commit | 1962f39abbb2d5643a7d59169422661a2d58793d (patch) | |
| tree | a6d5f0566e10d9fd1417d9deda78ebe83b067ca2 /fs/ocfs2 | |
| parent | 1c520dfbf391e1617ef61553f815b8006a066c44 (diff) | |
| download | kernel_samsung_espresso10-1962f39abbb2d5643a7d59169422661a2d58793d.zip kernel_samsung_espresso10-1962f39abbb2d5643a7d59169422661a2d58793d.tar.gz kernel_samsung_espresso10-1962f39abbb2d5643a7d59169422661a2d58793d.tar.bz2 | |
ocfs2: Update atime in splice read if necessary.
We should call ocfs2_inode_lock_atime instead of ocfs2_inode_lock
in ocfs2_file_splice_read like we do in ocfs2_file_aio_read so
that we can update atime in splice read if necessary.
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 07267e0..62442e4 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2026,7 +2026,7 @@ static ssize_t ocfs2_file_splice_read(struct file *in, size_t len, unsigned int flags) { - int ret = 0; + int ret = 0, lock_level = 0; struct inode *inode = in->f_path.dentry->d_inode; mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", in, pipe, @@ -2037,12 +2037,12 @@ static ssize_t ocfs2_file_splice_read(struct file *in, /* * See the comment in ocfs2_file_aio_read() */ - ret = ocfs2_inode_lock(inode, NULL, 0); + ret = ocfs2_inode_lock_atime(inode, in->f_vfsmnt, &lock_level); if (ret < 0) { mlog_errno(ret); goto bail; } - ocfs2_inode_unlock(inode, 0); + ocfs2_inode_unlock(inode, lock_level); ret = generic_file_splice_read(in, ppos, pipe, len, flags); |