Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2408f6ef authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

fuse: remove the second argument of k[un]map_atomic() 



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent d4a23aee

fs/fuse/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -838,10 +838,10 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep, 
			}

		}

		if (page) {

			void *mapaddr = kmap_atomic(page, KM_USER0);

			void *mapaddr = kmap_atomic(page);

			void *buf = mapaddr + offset;

			offset += fuse_copy_do(cs, &buf, &count);

			kunmap_atomic(mapaddr, KM_USER0);

			kunmap_atomic(mapaddr);

		} else

			offset += fuse_copy_do(cs, NULL, &count);

	}

fs/fuse/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1887,11 +1887,11 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg, 
		    in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV)

			goto out;



		vaddr = kmap_atomic(pages[0], KM_USER0);

		vaddr = kmap_atomic(pages[0]);

		err = fuse_copy_ioctl_iovec(fc, iov_page, vaddr,

					    transferred, in_iovs + out_iovs,

					    (flags & FUSE_IOCTL_COMPAT) != 0);

		kunmap_atomic(vaddr, KM_USER0);

		kunmap_atomic(vaddr);

		if (err)

			goto out;