X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fdrivers%2Fubd_kern.c;h=ee47b820f7e0d245fbb69968ea13db22b5cffe08;hb=1731da41698a0b4ce0b124c3771426720490471d;hp=bad209bf2e1fdd028901a0adc7b974bf1e0c85f2;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index bad209bf2..ee47b820f 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1004,7 +1004,7 @@ static int prepare_request(struct request *req, struct io_thread_req *io_req)
 		 * to write the data to disk first, then we can map the disk
 		 * page in and continue normally from there.
 		 */
-		if((rq_data_dir(req) == WRITE) && !is_remapped(req->buffer, dev->fd, io_req->offset + dev->cow.data_offset)){
+		if((rq_data_dir(req) == WRITE) && !is_remapped(req->buffer)){
 			io_req->map_fd = dev->fd;
 			io_req->map_offset = io_req->offset + 
 				dev->cow.data_offset;
@@ -1134,20 +1134,12 @@ static int ubd_ioctl(struct inode * inode, struct file * file,
 }
 
 static int ubd_check_remapped(int fd, unsigned long address, int is_write,
-			      __u64 offset, int is_user)
+			      __u64 offset)
 {
 	__u64 bitmap_offset;
 	unsigned long new_bitmap[2];
 	int i, err, n;
 
-	/* This can only fix kernelspace faults */
-	if(is_user)
-		return(0);
-
-	/* ubd-mmap is only enabled in skas mode */
-	if(CHOOSE_MODE(1, 0))
-		return(0);
-
 	/* If it's not a write access, we can't do anything about it */
 	if(!is_write)
 		return(0);