- ocfs2-bad-kunmap_atomic.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     ocfs2: bad kunmap_atomic()
has been removed from the -mm tree.  Its filename was
     ocfs2-bad-kunmap_atomic.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: ocfs2: bad kunmap_atomic()
From: Jens Axboe <jens.axboe@xxxxxxxxxx>

kunmap_atomic() takes the virtual address, not the mapped page as
argument.

Signed-off-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
Cc: Mark Fasheh <mark.fasheh@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/ocfs2/file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/ocfs2/file.c~ocfs2-bad-kunmap_atomic fs/ocfs2/file.c
--- a/fs/ocfs2/file.c~ocfs2-bad-kunmap_atomic
+++ a/fs/ocfs2/file.c
@@ -2153,7 +2153,7 @@ static int ocfs2_splice_write_actor(stru
 	src = buf->ops->map(pipe, buf, 1);
 	dst = kmap_atomic(page, KM_USER1);
 	memcpy(dst + offset, src + buf->offset, count);
-	kunmap_atomic(page, KM_USER1);
+	kunmap_atomic(dst, KM_USER1);
 	buf->ops->unmap(pipe, buf, src);
 
 	copied = ocfs2_write_end(file, file->f_mapping, sd->pos, count, count,
_

Patches currently in -mm which might be from jens.axboe@xxxxxxxxxx are

origin.patch
git-ocfs2.patch
git-scsi-rc-fixes.patch
git-block.patch
git-block-fix-headers_check.patch
git-block-whoops.patch
clean-up-duplicate-includes-in-drivers-block.patch
readahead-remove-the-limit-max_sectors_kb-imposed-on-max_readahead_kb.patch
revoke-vs-git-block.patch
git-block-vs-reiser4.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux