ocfs2: Update atime in splice read if necessary.
PATCH 1/1 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.
--- fs/ocfs2/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
fs/ocfs2/file.c +3 -3
@@ -2025,7 +2025,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,
@@ -2036,12 +2036,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);
Signature · 1 line
1.6.2.rc2.16.gf474c
PATCH 1/1 ocfs2: Update atime in splice read if necessary.
Quoted 38 lines · Tao Ma
We should call
ocfs2_inode_lock_atimeinstead ofocfs2_inode_lockinocfs2_file_splice_readlike we do inocfs2_file_aio_readso that we can update atime in splice read if necessary.Signed-off-by Tao Ma <[email protected]>--- fs/ocfs2/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)fs/ocfs2/file.c +3
-3@@ -2025,7 +2025,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,@@ -2036,12 +2036,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);
PATCH 1/1 ocfs2: Update atime in splice read if necessary.
In reply to Tao MaQuoted 5 lines · Tao Ma
We should call
ocfs2_inode_lock_atimeinstead ofocfs2_inode_lockinocfs2_file_splice_readlike we do inocfs2_file_aio_readso that we can update atime in splice read if necessary.Signed-off-by Tao Ma <[email protected]>
This is now in the fixes branch of ocfs2.git.
Joel
Signature · 9 lines
"Heav'n hath no rage like love to hatred turn'd, nor Hell a fury,
like a woman scorn'd."
- William Congreve
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127