Merge tag 'ceph-for-5.4-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-block.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 7e8c3e8ae75f123e7782444127aa91264b83417e..f1e8c7f93e04c61f825dbb22b2a8e3e25370f031 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1358,6 +1358,9 @@ static inline u64 file_mmap_size_max(struct file *file, struct inode *inode)
        if (S_ISBLK(inode->i_mode))
                return MAX_LFS_FILESIZE;
 
+       if (S_ISSOCK(inode->i_mode))
+               return MAX_LFS_FILESIZE;
+
        /* Special "we do even unsigned file positions" case */
        if (file->f_mode & FMODE_UNSIGNED_OFFSET)
                return 0;
@@ -1483,8 +1486,12 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
                case MAP_SHARED_VALIDATE:
                        if (flags & ~flags_mask)
                                return -EOPNOTSUPP;
-                       if ((prot&PROT_WRITE) && !(file->f_mode&FMODE_WRITE))
-                               return -EACCES;
+                       if (prot & PROT_WRITE) {
+                               if (!(file->f_mode & FMODE_WRITE))
+                                       return -EACCES;
+                               if (IS_SWAPFILE(file->f_mapping->host))
+                                       return -ETXTBSY;
+                       }
 
                        /*
                         * Make sure we don't allow writing to an append-only
@@ -2270,12 +2277,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
        if (vma) {
                *pprev = vma->vm_prev;
        } else {
-               struct rb_node *rb_node = mm->mm_rb.rb_node;
-               *pprev = NULL;
-               while (rb_node) {
-                       *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
-                       rb_node = rb_node->rb_right;
-               }
+               struct rb_node *rb_node = rb_last(&mm->mm_rb);
+
+               *pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL;
        }
        return vma;
 }