a couple of fixes for rc7
Al Viro
maintainernfsd performance regression fix + seq_file lseek(2) fix. Please, pull from the usual place -git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Shortlog:
Al Viro (1):
nfsd regression since delayed fput()
Gu Zheng (1):
seq_file: always update file->f_pos in seq_lseek()
Diffstat:
fs/file_table.c | 2 +- fs/seq_file.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-)
Quoted 3 lines · Al Viro
nfsd performance regression fix +
seq_filelseek(2) fix. Please, pull from the usual place -git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.gitfor-linus
Not acceptable.
fs/file_table.c: In function ‘fput’:fs/file_table.c:320:4: warning: passing argument 1 of ‘schedule_delayed_work’ from incompatible pointer type [enabled by default]
schedule_delayed_work(&delayed_fput_work, 1);
^
In file included from include/linux/srcu.h:34:0,
from include/linux/notifier.h:15,
from include/linux/memory_hotplug.h:6,
from include/linux/mmzone.h:797,
from include/linux/gfp.h:4,
from include/linux/slab.h:14,
from fs/file_table.c:9:include/linux/workqueue.h:594:60: note: expected ‘struct delayed_work *’ but argument is of type ‘struct work_struct *’
static inline bool schedule_delayed_work(struct delayed_work *dwork,
Plase stop sending me untested crap that doesn't even compile cleanly!
Linus
Al Viro
maintainerQuoted 20 lines · Linus Torvalds
Quoted 3 lines · Al Viro
nfsd performance regression fix +
seq_filelseek(2) fix. Please, pull from the usual place -git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.gitfor-linusNot acceptable.
fs/file_table.c: In function ???fput???:fs/file_table.c:320:4: warning: passing argument 1 of ???schedule_delayed_work??? from incompatible pointer type [enabled by default]schedule_delayed_work(&delayed_fput_work, 1); ^ In file included from include/linux/srcu.h:34:0, from include/linux/notifier.h:15, from include/linux/memory_hotplug.h:6, from include/linux/mmzone.h:797, from include/linux/gfp.h:4, from include/linux/slab.h:14, from fs/file_table.c:9:
Quoted 5 lines
include/linux/workqueue.h:594:60: note: expected ???structdelayed_work*??? but argument is of type ???structwork_struct*???
static inline bool schedule_delayed_work(structdelayed_work*dwork,Plase stop sending me untested crap that doesn't even compile cleanly!
Oh, hell... git cherry-pick (for the wrong place, at that) instead of just pushing the bugger as it was - it sat on top of previous vfs.git#for-linus. Mea culpa ;-/
I've pushed the right branch now; should propagate in a few minutes. Head should be at 05e16745c.