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);