Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull misc vfs updates from Al Viro:
 "Assorted stuff, really no common topic here"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: grab the lock instead of blocking in __fd_install during resizing
  vfs: stop clearing close on exec when closing a fd
  include/linux/fs.h: fix comment about struct address_space
  fs: make fiemap work from compat_ioctl
  coda: fix 'kernel memory exposure attempt' in fsync
  pstore: remove unneeded unlikely()
  vfs: remove unneeded unlikely()
  stubs for mount_bdev() and kill_block_super() in !CONFIG_BLOCK case
  make vfs_ustat() static
  do_handle_open() should be static
  elf_fdpic: fix unused variable warning
  fold destroy_super() into __put_super()
  new helper: destroy_unused_super()
  fix address space warnings in ipc/
  acct.h: get rid of detritus

4 files changed, 7 insertions, 7 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index bce7ac1c8099..1bbc029d2b17 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -591,13 +591,13 @@ static int copy_compat_msqid_from_user(struct msqid64_ds *out, void __user *buf,
 {
         memset(out, 0, sizeof(*out));
         if (version == IPC_64) {
-                struct compat_msqid64_ds *p = buf;
+                struct compat_msqid64_ds __user *p = buf;
                 if (get_compat_ipc64_perm(&out->msg_perm, &p->msg_perm))
                         return -EFAULT;
                 if (get_user(out->msg_qbytes, &p->msg_qbytes))
                         return -EFAULT;
         } else {
-                struct compat_msqid_ds *p = buf;
+                struct compat_msqid_ds __user *p = buf;
                 if (get_compat_ipc_perm(&out->msg_perm, &p->msg_perm))
                         return -EFAULT;
                 if (get_user(out->msg_qbytes, &p->msg_qbytes))
diff --git a/ipc/sem.c b/ipc/sem.c
index b2698ebdcb31..a5cff0e109ab 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1637,10 +1637,10 @@ static int copy_compat_semid_from_user(struct semid64_ds *out, void __user *buf,
 {
         memset(out, 0, sizeof(*out));
         if (version == IPC_64) {
-                struct compat_semid64_ds *p = buf;
+                struct compat_semid64_ds __user *p = buf;
                 return get_compat_ipc64_perm(&out->sem_perm, &p->sem_perm);
         } else {
-                struct compat_semid_ds *p = buf;
+                struct compat_semid_ds __user *p = buf;
                 return get_compat_ipc_perm(&out->sem_perm, &p->sem_perm);
         }
 }
diff --git a/ipc/shm.c b/ipc/shm.c
index bd652755d32c..7733d768666d 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1194,10 +1194,10 @@ static int copy_compat_shmid_from_user(struct shmid64_ds *out, void __user *buf,
 {
         memset(out, 0, sizeof(*out));
         if (version == IPC_64) {
-                struct compat_shmid64_ds *p = buf;
+                struct compat_shmid64_ds __user *p = buf;
                 return get_compat_ipc64_perm(&out->shm_perm, &p->shm_perm);
         } else {
-                struct compat_shmid_ds *p = buf;
+                struct compat_shmid_ds __user *p = buf;
                 return get_compat_ipc_perm(&out->shm_perm, &p->shm_perm);
         }
 }
diff --git a/ipc/syscall.c b/ipc/syscall.c
index 26b45db2e007..3763b4293b74 100644
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -172,7 +172,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
                                COMPAT_SHMLBA);
                 if (err < 0)
                         return err;
-                return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
+                return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
         }
         case SHMDT:
                 return sys_shmdt(compat_ptr(ptr));