diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 18:16:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-25 18:16:47 +0100 |
| commit | f55ac56d5ee8ef00aea9fa716625caa6ae8e9674 (patch) | |
| tree | 0df9b375616ce4a0279d597f8cbe167c966f0861 /fs | |
| parent | 4208c471995f90479cd129b15cd459b4a7eaebb3 (diff) | |
| parent | 05e16745c0c471bba313961b605b6da3b21a853d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes (try two) from Al Viro:
"nfsd performance regression fix + seq_file lseek(2) fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
seq_file: always update file->f_pos in seq_lseek()
nfsd regression since delayed fput()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/file_table.c | 4 | ||||
| -rw-r--r-- | fs/seq_file.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index abdd15ad13c..e900ca51863 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -297,7 +297,7 @@ void flush_delayed_fput(void) delayed_fput(NULL); } -static DECLARE_WORK(delayed_fput_work, delayed_fput); +static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); void fput(struct file *file) { @@ -317,7 +317,7 @@ void fput(struct file *file) } if (llist_add(&file->f_u.fu_llist, &delayed_fput_list)) - schedule_work(&delayed_fput_work); + schedule_delayed_work(&delayed_fput_work, 1); } } diff --git a/fs/seq_file.c b/fs/seq_file.c index 3135c2525c7..a290157265e 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence) m->read_pos = offset; retval = file->f_pos = offset; } + } else { + file->f_pos = offset; } } file->f_version = m->version; |