diff options
author | Hugh Dickins <hugh@veritas.com> | 2006-06-23 05:03:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:42:51 -0400 |
commit | 185606fc6a120dbebffa6d06a559c20ec2b20034 (patch) | |
tree | 6702725dd3da6371d0816dceb1a358a67ae32a99 | |
parent | 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0 (diff) |
[PATCH] remove unused o_flags from do_shmat
Remove the unused variable o_flags from do_shmat.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | ipc/shm.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -698,7 +698,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) | |||
698 | int err; | 698 | int err; |
699 | unsigned long flags; | 699 | unsigned long flags; |
700 | unsigned long prot; | 700 | unsigned long prot; |
701 | unsigned long o_flags; | ||
702 | int acc_mode; | 701 | int acc_mode; |
703 | void *user_addr; | 702 | void *user_addr; |
704 | 703 | ||
@@ -725,11 +724,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) | |||
725 | 724 | ||
726 | if (shmflg & SHM_RDONLY) { | 725 | if (shmflg & SHM_RDONLY) { |
727 | prot = PROT_READ; | 726 | prot = PROT_READ; |
728 | o_flags = O_RDONLY; | ||
729 | acc_mode = S_IRUGO; | 727 | acc_mode = S_IRUGO; |
730 | } else { | 728 | } else { |
731 | prot = PROT_READ | PROT_WRITE; | 729 | prot = PROT_READ | PROT_WRITE; |
732 | o_flags = O_RDWR; | ||
733 | acc_mode = S_IRUGO | S_IWUGO; | 730 | acc_mode = S_IRUGO | S_IWUGO; |
734 | } | 731 | } |
735 | if (shmflg & SHM_EXEC) { | 732 | if (shmflg & SHM_EXEC) { |