vfs: atomic f_pos access in llseek()

ebiggers · Al Viro · commit d7a15f8d0777 · 2014-03-23T00:03:12.000-04:00
Commit 9c225f2 ("vfs: atomic f_pos accesses as per POSIX") changed several system calls to use fdget_pos() instead of fdget(), but missed sys_llseek(). Fix it. Signed-off-by: Eric Biggers <ebiggers3@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/read_write.c b/fs/read_write.c
@@ -307,7 +307,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
 		unsigned int, whence)
 {
 	int retval;
-	struct fd f = fdget(fd);
+	struct fd f = fdget_pos(fd);
 	loff_t offset;
 
 	if (!f.file)
@@ -327,7 +327,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
 			retval = 0;
 	}
 out_putf:
-	fdput(f);
+	fdput_pos(f);
 	return retval;
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,`
`307`	`307`	`unsigned int, whence)`
`308`	`308`	`{`
`309`	`309`	`int retval;`
`310`		`- struct fd f = fdget(fd);`
	`310`	`+ struct fd f = fdget_pos(fd);`
`311`	`311`	`loff_t offset;`
`312`	`312`
`313`	`313`	`if (!f.file)`
`@@ -327,7 +327,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,`
`327`	`327`	`retval = 0;`
`328`	`328`	`}`
`329`	`329`	`out_putf:`
`330`		`- fdput(f);`
	`330`	`+ fdput_pos(f);`
`331`	`331`	`return retval;`
`332`	`332`	`}`
`333`	`333`	`#endif`