hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/infiniband/hw/qib/qib_file_ops.c
....@@ -40,10 +40,10 @@
4040 #include <linux/highmem.h>
4141 #include <linux/io.h>
4242 #include <linux/jiffies.h>
43
-#include <asm/pgtable.h>
4443 #include <linux/delay.h>
4544 #include <linux/export.h>
4645 #include <linux/uio.h>
46
+#include <linux/pgtable.h>
4747
4848 #include <rdma/ib.h>
4949
....@@ -343,7 +343,7 @@
343343
344344 /* virtual address of first page in transfer */
345345 vaddr = ti->tidvaddr;
346
- if (!access_ok(VERIFY_WRITE, (void __user *) vaddr,
346
+ if (!access_ok((void __user *) vaddr,
347347 cnt * PAGE_SIZE)) {
348348 ret = -EFAULT;
349349 goto done;
....@@ -1789,7 +1789,6 @@
17891789
17901790 static int qib_close(struct inode *in, struct file *fp)
17911791 {
1792
- int ret = 0;
17931792 struct qib_filedata *fd;
17941793 struct qib_ctxtdata *rcd;
17951794 struct qib_devdata *dd;
....@@ -1873,7 +1872,7 @@
18731872
18741873 bail:
18751874 kfree(fd);
1876
- return ret;
1875
+ return 0;
18771876 }
18781877
18791878 static int qib_ctxt_info(struct file *fp, struct qib_ctxt_info __user *uinfo)