bcache: use (REQ_META|REQ_PRIO) to indicate bio for metadata

[linux.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index 4cd402e4cfeb603e2417a3796c3d9b22f3022f89..0842411cb0e9b28a715d6e2b751a358b0dd7cdb7 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -206,7 +206,7 @@ static inline struct shmid_kernel *shm_lock(struct ipc_namespace *ns, int id)
         * Callers of shm_lock() must validate the status of the returned ipc
         * object pointer and error out as appropriate.
         */
-       return (void *)ipcp;
+       return ERR_CAST(ipcp);
 }
 
 static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp)
@@ -1202,9 +1202,9 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
 struct compat_shmid_ds {
        struct compat_ipc_perm shm_perm;
        int shm_segsz;
-       compat_time_t shm_atime;
-       compat_time_t shm_dtime;
-       compat_time_t shm_ctime;
+       old_time32_t shm_atime;
+       old_time32_t shm_dtime;
+       old_time32_t shm_ctime;
        compat_ipc_pid_t shm_cpid;
        compat_ipc_pid_t shm_lpid;
        unsigned short shm_nattch;