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

Commit 238f4c54 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Make couple names consitent, be more defensive on releasepage (and 


prep for nobh, someday, maybe).

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:25481a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent a13828b1

fs/xfs/linux-2.6/xfs_aops.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -1178,7 +1178,7 @@ xfs_vm_writepage( 
 *    free them and we should come back later via writepage.

 *    free them and we should come back later via writepage.

 */

 */

STATIC int

STATIC int

xfs_vm_release_page(

xfs_vm_releasepage(

	struct page		*page,

	struct page		*page,

	gfp_t			gfp_mask)

	gfp_t			gfp_mask)

{

{
@@ -1191,6 +1191,9 @@ xfs_vm_release_page( 




	xfs_page_trace(XFS_RELEASEPAGE_ENTER, inode, page, gfp_mask);

	xfs_page_trace(XFS_RELEASEPAGE_ENTER, inode, page, gfp_mask);





	if (!page_has_buffers(page))

		return 0;



	xfs_count_page_state(page, &delalloc, &unmapped, &unwritten);

	xfs_count_page_state(page, &delalloc, &unmapped, &unwritten);

	if (!delalloc && !unwritten)

	if (!delalloc && !unwritten)

		goto free_buffers;

		goto free_buffers;
@@ -1440,7 +1443,7 @@ xfs_vm_readpages( 
}

}





STATIC int

STATIC int

xfs_vm_invalidate_page(

xfs_vm_invalidatepage(

	struct page		*page,

	struct page		*page,

	unsigned long		offset)

	unsigned long		offset)

{

{
@@ -1454,8 +1457,8 @@ struct address_space_operations xfs_address_space_operations = { 
	.readpages		= xfs_vm_readpages,

	.readpages		= xfs_vm_readpages,

	.writepage		= xfs_vm_writepage,

	.writepage		= xfs_vm_writepage,

	.sync_page		= block_sync_page,

	.sync_page		= block_sync_page,

	.releasepage		= xfs_vm_release_page,

	.releasepage		= xfs_vm_releasepage,

	.invalidatepage		= xfs_vm_invalidate_page,

	.invalidatepage		= xfs_vm_invalidatepage,

	.prepare_write		= xfs_vm_prepare_write,

	.prepare_write		= xfs_vm_prepare_write,

	.commit_write		= generic_commit_write,

	.commit_write		= generic_commit_write,

	.bmap			= xfs_vm_bmap,

	.bmap			= xfs_vm_bmap,