From 56660473855dd3dc8f8567157b5140cc0b7d1ac7 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Fri, 19 Jun 2009 15:36:52 +0800
Subject: [PATCH] --- yaml --- r: 154076 b: refs/heads/master c:
 1962f39abbb2d5643a7d59169422661a2d58793d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9608c42e94ae..524fe2653663 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c520dfbf391e1617ef61553f815b8006a066c44
+refs/heads/master: 1962f39abbb2d5643a7d59169422661a2d58793d
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 07267e0da909..62442e413a00 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/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);