---

yaml --- r: 212983 b: refs/heads/master c: ab91261 h: refs/heads/master i: 212981: 811fe6b 212979: 172a2c9 212975: 7652ec5 v: v3
git-mirror · Oct 15, 2010 · 8d2beff · 8d2beff
1 parent ec0a026
commit 8d2beff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);