tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds f55ac56d 4208c471

+4 -2
+2 -2
fs/file_table.c
··· 297 297 delayed_fput(NULL); 298 298 } 299 299 300 - static DECLARE_WORK(delayed_fput_work, delayed_fput); 300 + static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); 301 301 302 302 void fput(struct file *file) 303 303 { ··· 317 317 } 318 318 319 319 if (llist_add(&file->f_u.fu_llist, &delayed_fput_list)) 320 - schedule_work(&delayed_fput_work); 320 + schedule_delayed_work(&delayed_fput_work, 1); 321 321 } 322 322 } 323 323
+2
fs/seq_file.c
··· 328 328 m->read_pos = offset; 329 329 retval = file->f_pos = offset; 330 330 } 331 + } else { 332 + file->f_pos = offset; 331 333 } 332 334 } 333 335 file->f_version = m->version;