The patch titled
sys_swapon: move setting of swapfilepages near use
has been removed from the -mm tree. Its filename was
sys_swapon-move-setting-of-swapfilepages-near-use.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sys_swapon: move setting of swapfilepages near use
From: Cesar Eduardo Barros <cesarb@xxxxxxxxxx>
There is no reason I can see to read inode->i_size long before it is
needed. Move its read to just before it is needed, to reduce the
variable lifetime.
Signed-off-by: Cesar Eduardo Barros <cesarb@xxxxxxxxxx>
Tested-by: Eric B Munson <emunson@xxxxxxxxx>
Acked-by: Eric B Munson <emunson@xxxxxxxxx>
Reviewed-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swapfile.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff -puN mm/swapfile.c~sys_swapon-move-setting-of-swapfilepages-near-use mm/swapfile.c
--- a/mm/swapfile.c~sys_swapon-move-setting-of-swapfilepages-near-use
+++ a/mm/swapfile.c
@@ -1975,8 +1975,6 @@ SYSCALL_DEFINE2(swapon, const char __use
if (unlikely(error))
goto bad_swap;
- swapfilepages = i_size_read(inode) >> PAGE_SHIFT;
-
/*
* Read the swap header.
*/
@@ -2045,6 +2043,7 @@ SYSCALL_DEFINE2(swapon, const char __use
error = -EINVAL;
if (!maxpages)
goto bad_swap;
+ swapfilepages = i_size_read(inode) >> PAGE_SHIFT;
if (swapfilepages && maxpages > swapfilepages) {
printk(KERN_WARNING
"Swap area shorter than signature indicates\n");
_
Patches currently in -mm which might be from cesarb@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
