Commit 62672619 authored by Chris Wright's avatar Chris Wright Committed by Linus Torvalds

[PATCH] 2.5-bk trivial LSM cleanup

Trivial patch from Randy Dunlap <rddunlap@osdl.org> removes some useless
error/retval assignments.
parent 47baab89
...@@ -57,7 +57,6 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) ...@@ -57,7 +57,6 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
filp = fget(fd); filp = fget(fd);
if (!filp) if (!filp)
goto out; goto out;
error = 0;
error = security_file_ioctl(filp, cmd, arg); error = security_file_ioctl(filp, cmd, arg);
if (error) { if (error) {
......
...@@ -287,7 +287,7 @@ void umount_tree(struct vfsmount *mnt) ...@@ -287,7 +287,7 @@ void umount_tree(struct vfsmount *mnt)
static int do_umount(struct vfsmount *mnt, int flags) static int do_umount(struct vfsmount *mnt, int flags)
{ {
struct super_block * sb = mnt->mnt_sb; struct super_block * sb = mnt->mnt_sb;
int retval = 0; int retval;
retval = security_sb_umount(mnt, flags); retval = security_sb_umount(mnt, flags);
if (retval) if (retval)
......
...@@ -1317,7 +1317,7 @@ asmlinkage long sys_umask(int mask) ...@@ -1317,7 +1317,7 @@ asmlinkage long sys_umask(int mask)
asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3, asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5) unsigned long arg4, unsigned long arg5)
{ {
int error = 0; int error;
int sig; int sig;
error = security_task_prctl(option, arg2, arg3, arg4, arg5); error = security_task_prctl(option, arg2, arg3, arg4, arg5);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment