Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit f55ac56d5ee8 · 2013-10-25T18:16:47.000+01:00
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-&gt;f_pos in seq_lseek()
  nfsd regression since delayed fput()
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ void flush_delayed_fput(void)`
`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,7 +317,7 @@ void fput(struct file *file)`
`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`
Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,8 @@ loff_t seq_lseek(struct file *file, loff_t offset, int whence)`
`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;`