Merge bk://kernel.bkbits.net/davem/sparc-2.4
Linux Kernel Mailing List <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.2-4 |
|---|---|
| Message-ID | <[email protected]> |
ChangeSet 1.1557, 2005/02/09 10:04:36-02:00, [email protected] Merge bk://kernel.bkbits.net/davem/sparc-2.4 into logos.cnet:/home/marcelo/bk/linux-2.4 sys_sparc32.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c --- a/arch/sparc64/kernel/sys_sparc32.c 2005-02-09 09:09:44 -08:00 +++ b/arch/sparc64/kernel/sys_sparc32.c 2005-02-09 09:09:44 -08:00 @@ -1095,7 +1095,6 @@ __kernel_ssize_t32 tot_len; struct iovec iovstack[UIO_FASTIOV]; struct iovec *iov=iovstack, *ivp; - struct inode *inode; long retval, i; io_fn_t fn; iov_fn_t fnv; @@ -1142,11 +1141,9 @@ i--; } - inode = file->f_dentry->d_inode; /* VERIFY_WRITE actually means a read, as we write to user space */ - retval = locks_verify_area((type == VERIFY_WRITE - ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE), - inode, file, file->f_pos, tot_len); + retval = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE), + file, &file->f_pos, tot_len); if (retval) goto out;