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

Commit 27d54b39 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

shmem: SGP_QUICK and SGP_FAULT redundant 



Remove SGP_QUICK from the sgp_type enum: it was for shmem_populate and has no
users now.  Remove SGP_FAULT from the enum: SGP_CACHE does just as well (and
shmem_getpage is about to return with page always locked).

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 02098fea

mm/shmem.c

+2 −6
Original line number Diff line number Diff line
@@ -78,11 +78,9 @@ 


/* Flag allocation requirements to shmem_getpage and shmem_swp_alloc */

enum sgp_type {

	SGP_QUICK,	/* don't try more than file page cache lookup */

	SGP_READ,	/* don't exceed i_size, don't allocate page */

	SGP_CACHE,	/* don't exceed i_size, may allocate page */

	SGP_WRITE,	/* may exceed i_size, may allocate page */

	SGP_FAULT,	/* same as SGP_CACHE, return with page locked */

};



static int shmem_getpage(struct inode *inode, unsigned long idx,
@@ -1116,8 +1114,6 @@ repeat: 
	if (filepage && PageUptodate(filepage))

		goto done;

	error = 0;

	if (sgp == SGP_QUICK)

		goto failed;

	gfp = mapping_gfp_mask(mapping);



	spin_lock(&info->lock);
@@ -1292,7 +1288,7 @@ repeat: 
done:

	if (*pagep != filepage) {

		*pagep = filepage;

		if (sgp != SGP_FAULT)

		if (sgp != SGP_CACHE)

			unlock_page(filepage);



	}
@@ -1315,7 +1311,7 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	if (((loff_t)vmf->pgoff << PAGE_CACHE_SHIFT) >= i_size_read(inode))

		return VM_FAULT_SIGBUS;



	error = shmem_getpage(inode, vmf->pgoff, &vmf->page, SGP_FAULT, &ret);

	error = shmem_getpage(inode, vmf->pgoff, &vmf->page, SGP_CACHE, &ret);

	if (error)

		return ((error == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS);