From: Neil Horman <nhorman@tuxdriver.com>
Date: Tue, 10 Jun 2008 12:53:39 +0000 (-0400)
Subject: shm: Remove silly double assignment
X-Git-Tag: v2.6.26-rc6~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c592713b3e124ce0719e6af4bc2520424c49cbae;p=linux-2.6-omap-h63xx.git

shm: Remove silly double assignment

Found a silly double assignment of err is do_shmat.  Silly, but good to
clean up the useless code.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/ipc/shm.c b/ipc/shm.c
index 554429ade07..d05f6b56499 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -894,8 +894,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
 	if (!sfd)
 		goto out_put_dentry;
 
-	err = -ENOMEM;
-
 	file = alloc_file(path.mnt, path.dentry, f_mode, &shm_file_operations);
 	if (!file)
 		goto out_free;