aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2008-06-10 08:53:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-10 07:58:00 -0700
commitc592713b3e124ce0719e6af4bc2520424c49cbae (patch)
tree5b8c212fb7601c0560f16c46543581d6b4fd726a
parent5e70b7f3c24468bb1635b295945edb48ecd9656a (diff)
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>
-rw-r--r--ipc/shm.c2
1 files changed, 0 insertions, 2 deletions
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;