lkml.org 
[lkml]   [2011]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCHv2 08/24] sys_swapon: move setting of error nearer use
Date
Move the setting of the error variable nearer the goto in a few places.

Avoids calling PTR_ERR() if not IS_ERR() in two places, and makes the
error condition more explicit in two other places.

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>
---
mm/swapfile.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 8893c10..55a50ef 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1917,14 +1917,14 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
return PTR_ERR(p);

name = getname(specialfile);
- error = PTR_ERR(name);
if (IS_ERR(name)) {
+ error = PTR_ERR(name);
name = NULL;
goto bad_swap_2;
}
swap_file = filp_open(name, O_RDWR|O_LARGEFILE, 0);
- error = PTR_ERR(swap_file);
if (IS_ERR(swap_file)) {
+ error = PTR_ERR(swap_file);
swap_file = NULL;
goto bad_swap_2;
}
@@ -1933,17 +1933,17 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
mapping = swap_file->f_mapping;
inode = mapping->host;

- error = -EBUSY;
for (i = 0; i < nr_swapfiles; i++) {
struct swap_info_struct *q = swap_info[i];

if (q == p || !q->swap_file)
continue;
- if (mapping == q->swap_file->f_mapping)
+ if (mapping == q->swap_file->f_mapping) {
+ error = -EBUSY;
goto bad_swap;
+ }
}

- error = -EINVAL;
if (S_ISBLK(inode->i_mode)) {
bdev = bdgrab(I_BDEV(inode));
error = blkdev_get(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL,
@@ -1968,6 +1968,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
goto bad_swap;
}
} else {
+ error = -EINVAL;
goto bad_swap;
}

--
1.7.4


\
 
 \ /
  Last update: 2011-03-06 12:19    [W:0.137 / U:4.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site