lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sys_swapon: remove bdev variable

Browse Source 
The bdev variable is always equivalent to (S_ISBLK(inode->i_mode) ?
p->bdev : NULL), as long as it being set is moved to a bit earlier. Use
this fact to remove the bdev variable.

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: 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>
This commit is contained in:
Cesar Eduardo Barros
2011-03-22 16:33:23 -07:00
committed by Linus Torvalds
parent 7de7fb6b34
commit f2090d2df5
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mm/swapfile.c
View File

@@ -1893,7 +1893,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
{ {
struct swap_info_struct *p; struct swap_info_struct *p;
char *name; char *name;
struct block_device *bdev = NULL;
struct file *swap_file = NULL; struct file *swap_file = NULL;
struct address_space *mapping; struct address_space *mapping;
int i, prev; int i, prev;
@@ -1944,19 +1943,19 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
} }
if (S_ISBLK(inode->i_mode)) { if (S_ISBLK(inode->i_mode)) {
bdev = bdgrab(I_BDEV(inode)); p->bdev = bdgrab(I_BDEV(inode));
error = blkdev_get(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL, error = blkdev_get(p->bdev,
FMODE_READ | FMODE_WRITE | FMODE_EXCL,
sys_swapon); sys_swapon);
if (error < 0) { if (error < 0) {
bdev = NULL; p->bdev = NULL;
error = -EINVAL; error = -EINVAL;
goto bad_swap; goto bad_swap;
} }
p->old_block_size = block_size(bdev); p->old_block_size = block_size(p->bdev);
error = set_blocksize(bdev, PAGE_SIZE); error = set_blocksize(p->bdev, PAGE_SIZE);
if (error < 0) if (error < 0)
goto bad_swap; goto bad_swap;
p->bdev = bdev;
p->flags |= SWP_BLKDEV; p->flags |= SWP_BLKDEV;
} else if (S_ISREG(inode->i_mode)) { } else if (S_ISREG(inode->i_mode)) {
p->bdev = inode->i_sb->s_bdev; p->bdev = inode->i_sb->s_bdev;
@@ -2140,9 +2139,9 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
error = 0; error = 0;
goto out; goto out;
bad_swap: bad_swap:
if (bdev) { if (S_ISBLK(inode->i_mode) && p->bdev) {
set_blocksize(bdev, p->old_block_size); set_blocksize(p->bdev, p->old_block_size);
blkdev_put(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL); blkdev_put(p->bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL);
} }
destroy_swap_extents(p); destroy_swap_extents(p);
swap_cgroup_swapoff(p->type); swap_cgroup_swapoff(p->type);