diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-07-07 22:55:17 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-15 15:53:34 +0200 |
| commit | ab91261f5c43f196ec7ff1d113847b87b7606b26 (patch) | |
| tree | ba368bdd2156e3e6671be4bc1c0933fa5fad51b9 /fs | |
| parent | 6038f373a3dc1f1c26496e60b6c40b164716f07e (diff) | |
| download | linux-3.10-ab91261f5c43f196ec7ff1d113847b87b7606b26.tar.gz linux-3.10-ab91261f5c43f196ec7ff1d113847b87b7606b26.tar.bz2 linux-3.10-ab91261f5c43f196ec7ff1d113847b87b7606b26.zip | |
vfs: don't use BKL in default_llseek
There are currently 191 users of default_llseek.
Nine of these are in device drivers that use the
big kernel lock. None of these ever touch
file->f_pos outside of llseek or file_pos_write.
Consequently, we never rely on the BKL
in the default_llseek function and can
replace that with i_mutex, which is also
used in generic_file_llseek.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/read_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 74e36586e4d..fd09f6166cc 100644 --- a/fs/read_write.c +++ b/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); |