Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2 files changed, 5 insertions, 2 deletions

diff --git a/fs/bio.c b/fs/bio.c
index 098c12b2d60a..6a0b9ad8f8c9 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -654,9 +654,10 @@ static struct bio *__bio_map_user_iov(request_queue_t *q,
                                      write_to_vm, 0, &pages[cur_page], NULL);
                 up_read(&current->mm->mmap_sem);
 
-                if (ret < local_nr_pages)
+                if (ret < local_nr_pages) {
+                        ret = -EFAULT;
                         goto out_unmap;
-
+                }
 
                 offset = uaddr & ~PAGE_MASK;
                 for (j = cur_page; j < page_limit; j++) {
diff --git a/fs/locks.c b/fs/locks.c
index 6f99c0a6f836..ab61a8b54829 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -755,6 +755,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
         if (request->fl_type == F_UNLCK)
                 goto out;
 
+        error = -ENOMEM;
         new_fl = locks_alloc_lock();
         if (new_fl == NULL)
                 goto out;
@@ -781,6 +782,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
         locks_copy_lock(new_fl, request);
         locks_insert_lock(&inode->i_flock, new_fl);
         new_fl = NULL;
+        error = 0;
 
 out:
         unlock_kernel();