diff options
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 abdd15ad13c9..e900ca518635 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
@@ -297,7 +297,7 @@ void flush_delayed_fput(void) | |||
297 | delayed_fput(NULL); | 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 | void fput(struct file *file) | 302 | void fput(struct file *file) |
303 | { | 303 | { |
@@ -317,7 +317,7 @@ void fput(struct file *file) | |||
317 | } | 317 | } |
318 | 318 | ||
319 | if (llist_add(&file->f_u.fu_llist, &delayed_fput_list)) | 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 | ||
diff --git a/fs/seq_file.c b/fs/seq_file.c index 3135c2525c76..a290157265ef 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) | |||
328 | m->read_pos = offset; | 328 | m->read_pos = offset; |
329 | retval = file->f_pos = offset; | 329 | retval = file->f_pos = offset; |
330 | } | 330 | } |
331 | } else { | ||
332 | file->f_pos = offset; | ||
331 | } | 333 | } |
332 | } | 334 | } |
333 | file->f_version = m->version; | 335 | file->f_version = m->version; |