From 8d2beff6ccadba62ec15466ab287282ee8a8183a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 7 Jul 2010 22:55:17 +0200
Subject: [PATCH] --- yaml --- r: 212983 b: refs/heads/master c:
 ab91261f5c43f196ec7ff1d113847b87b7606b26 h: refs/heads/master i:   212981:
 811fe6bf9120c5ac5bb97d5a9d9696c78adfa970   212979:
 172a2c96684a0db6b103ef4aa7e5e36566fe4667   212975:
 7652ec5a4b3cd1684ace744e8e92a0c3566e3aae v: v3

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

diff --git a/[refs] b/[refs]
index 7470f10625a3..ca274e4585c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6038f373a3dc1f1c26496e60b6c40b164716f07e
+refs/heads/master: ab91261f5c43f196ec7ff1d113847b87b7606b26
diff --git a/trunk/fs/read_write.c b/trunk/fs/read_write.c
index 74e36586e4d3..fd09f6166ccf 100644
--- a/trunk/fs/read_write.c
+++ b/trunk/fs/read_write.c
@@ -124,7 +124,7 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin)
 {
 	loff_t retval;
 
-	lock_kernel();
+	mutex_lock(&file->f_dentry->d_inode->i_mutex);
 	switch (origin) {
 		case SEEK_END:
 			offset += i_size_read(file->f_path.dentry->d_inode);
@@ -145,7 +145,7 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin)
 		retval = offset;
 	}
 out:
-	unlock_kernel();
+	mutex_unlock(&file->f_dentry->d_inode->i_mutex);
 	return retval;
 }
 EXPORT_SYMBOL(default_llseek);