[PATCH] 2.5-bk trivial LSM cleanup

Trivial patch from Randy Dunlap <rddunlap@osdl.org> removes some useless
error/retval assignments.

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 9e16c74..c25c767 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -57,7 +57,6 @@ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
        filp = fget(fd);
        if (!filp)
                goto out;
-       error = 0;
 
        error = security_file_ioctl(filp, cmd, arg);
        if (error) {

diff --git a/fs/namespace.c b/fs/namespace.c
index 64b4b14..8bfa785 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -287,7 +287,7 @@ void umount_tree(struct vfsmount *mnt)
 static int do_umount(struct vfsmount *mnt, int flags)
 {
        struct super_block * sb = mnt->mnt_sb;
-       int retval = 0;
+       int retval;
 
        retval = security_sb_umount(mnt, flags);
        if (retval)

diff --git a/kernel/sys.c b/kernel/sys.c
index b06552e..10c8db1 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1317,7 +1317,7 @@ asmlinkage long sys_umask(int mask)
 asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
                          unsigned long arg4, unsigned long arg5)
 {
-       int error = 0;
+       int error;
        int sig;
 
        error = security_task_prctl(option, arg2, arg3, arg4, arg5);