ext4: don't set PageUptodate in ext4_end_bio()

[~andy/linux] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 0e0d49bbb867f239be5690968227c53e7c0226c0..34193ed69fbe03bcd6d5514f557e5eed5865b96f 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -817,7 +817,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid,
                }
 
                err = -EACCES;
-               if (ipcperms (&sma->sem_perm, S_IRUGO))
+               if (ipcperms(ns, &sma->sem_perm, S_IRUGO))
                        goto out_unlock;
 
                err = security_sem_semctl(sma, cmd);
@@ -862,7 +862,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
        nsems = sma->sem_nsems;
 
        err = -EACCES;
-       if (ipcperms (&sma->sem_perm, (cmd==SETVAL||cmd==SETALL)?S_IWUGO:S_IRUGO))
+       if (ipcperms(ns, &sma->sem_perm,
+                       (cmd == SETVAL || cmd == SETALL) ? S_IWUGO : S_IRUGO))
                goto out_unlock;
 
        err = security_sem_semctl(sma, cmd);
@@ -1047,7 +1048,8 @@ static int semctl_down(struct ipc_namespace *ns, int semid,
                        return -EFAULT;
        }
 
-       ipcp = ipcctl_pre_down(&sem_ids(ns), semid, cmd, &semid64.sem_perm, 0);
+       ipcp = ipcctl_pre_down(ns, &sem_ids(ns), semid, cmd,
+                              &semid64.sem_perm, 0);
        if (IS_ERR(ipcp))
                return PTR_ERR(ipcp);
 
@@ -1360,7 +1362,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
         * semid identifiers are not unique - find_alloc_undo may have
         * allocated an undo structure, it was invalidated by an RMID
         * and now a new array with received the same id. Check and fail.
-        * This case can be detected checking un->semid. The existance of
+        * This case can be detected checking un->semid. The existence of
         * "un" itself is guaranteed by rcu.
         */
        error = -EIDRM;
@@ -1386,7 +1388,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
                goto out_unlock_free;
 
        error = -EACCES;
-       if (ipcperms(&sma->sem_perm, alter ? S_IWUGO : S_IRUGO))
+       if (ipcperms(ns, &sma->sem_perm, alter ? S_IWUGO : S_IRUGO))
                goto out_unlock_free;
 
        error = security_sem_semop(sma, sops, nsops, alter);