diff options
author | Cesar Eduardo Barros <cesarb@cesarb.net> | 2011-03-22 19:33:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-22 20:44:07 -0400 |
commit | 5de771e41f0fc2243c39585357b73f0ff757b280 (patch) | |
tree | a807bb46f4334b6697c0dba7dc80075e8dccae5f | |
parent | 87ade72a799a9a895b4a60918c32b43d3dfc3324 (diff) |
sys_swapon: move setting of swapfilepages near use
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@cesarb.net>
Tested-by: Eric B Munson <emunson@mgebm.net>
Acked-by: Eric B Munson <emunson@mgebm.net>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/swapfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 61a604c12a96..4dade515b086 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
@@ -1975,8 +1975,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) | |||
1975 | if (unlikely(error)) | 1975 | if (unlikely(error)) |
1976 | goto bad_swap; | 1976 | goto bad_swap; |
1977 | 1977 | ||
1978 | swapfilepages = i_size_read(inode) >> PAGE_SHIFT; | ||
1979 | |||
1980 | /* | 1978 | /* |
1981 | * Read the swap header. | 1979 | * Read the swap header. |
1982 | */ | 1980 | */ |
@@ -2045,6 +2043,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) | |||
2045 | error = -EINVAL; | 2043 | error = -EINVAL; |
2046 | if (!maxpages) | 2044 | if (!maxpages) |
2047 | goto bad_swap; | 2045 | goto bad_swap; |
2046 | swapfilepages = i_size_read(inode) >> PAGE_SHIFT; | ||
2048 | if (swapfilepages && maxpages > swapfilepages) { | 2047 | if (swapfilepages && maxpages > swapfilepages) { |
2049 | printk(KERN_WARNING | 2048 | printk(KERN_WARNING |
2050 | "Swap area shorter than signature indicates\n"); | 2049 | "Swap area shorter than signature indicates\n"); |