Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs update from Al Viro:

 - big one - consolidation of descriptor-related logics; almost all of
   that is moved to fs/file.c

   (BTW, I'm seriously tempted to rename the result to fd.c.  As it is,
   we have a situation when file_table.c is about handling of struct
   file and file.c is about handling of descriptor tables; the reasons
   are historical - file_table.c used to be about a static array of
   struct file we used to have way back).

   A lot of stray ends got cleaned up and converted to saner primitives,
   disgusting mess in android/binder.c is still disgusting, but at least
   doesn't poke so much in descriptor table guts anymore.  A bunch of
   relatively minor races got fixed in process, plus an ext4 struct file
   leak.

 - related thing - fget_light() partially unuglified; see fdget() in
   there (and yes, it generates the code as good as we used to have).

 - also related - bits of Cyrill's procfs stuff that got entangled into
   that work; _not_ all of it, just the initial move to fs/proc/fd.c and
   switch of fdinfo to seq_file.

 - Alex's fs/coredump.c spiltoff - the same story, had been easier to
   take that commit than mess with conflicts.  The rest is a separate
   pile, this was just a mechanical code movement.

 - a few misc patches all over the place.  Not all for this cycle,
   there'll be more (and quite a few currently sit in akpm's tree)."

Fix up trivial conflicts in the android binder driver, and some fairly
simple conflicts due to two different changes to the sock_alloc_file()
interface ("take descriptor handling from sock_alloc_file() to callers"
vs "net: Providing protocol type via system.sockprotoname xattr of
/proc/PID/fd entries" adding a dentry name to the socket)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (72 commits)
  MAX_LFS_FILESIZE should be a loff_t
  compat: fs: Generic compat_sys_sendfile implementation
  fs: push rcu_barrier() from deactivate_locked_super() to filesystems
  btrfs: reada_extent doesn't need kref for refcount
  coredump: move core dump functionality into its own file
  coredump: prevent double-free on an error path in core dumper
  usb/gadget: fix misannotations
  fcntl: fix misannotations
  ceph: don't abuse d_delete() on failure exits
  hypfs: ->d_parent is never NULL or negative
  vfs: delete surplus inode NULL check
  switch simple cases of fget_light to fdget
  new helpers: fdget()/fdput()
  switch o2hb_region_dev_write() to fget_light()
  proc_map_files_readdir(): don't bother with grabbing files
  make get_file() return its argument
  vhost_set_vring(): turn pollstart/pollstop into bool
  switch prctl_set_mm_exe_file() to fget_light()
  switch xfs_find_handle() to fget_light()
  switch xfs_swapext() to fget_light()
  ...

1 files changed, 39 insertions, 39 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 9a08acc9e649..6d255e535d03 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -944,7 +944,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
                 size_t, msg_len, unsigned int, msg_prio,
                 const struct timespec __user *, u_abs_timeout)
 {
-        struct file *filp;
+        struct fd f;
         struct inode *inode;
         struct ext_wait_queue wait;
         struct ext_wait_queue *receiver;
@@ -967,21 +967,21 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
 
         audit_mq_sendrecv(mqdes, msg_len, msg_prio, timeout ? &ts : NULL);
 
-        filp = fget(mqdes);
-        if (unlikely(!filp)) {
+        f = fdget(mqdes);
+        if (unlikely(!f.file)) {
                 ret = -EBADF;
                 goto out;
         }
 
-        inode = filp->f_path.dentry->d_inode;
-        if (unlikely(filp->f_op != &mqueue_file_operations)) {
+        inode = f.file->f_path.dentry->d_inode;
+        if (unlikely(f.file->f_op != &mqueue_file_operations)) {
                 ret = -EBADF;
                 goto out_fput;
         }
         info = MQUEUE_I(inode);
-        audit_inode(NULL, filp->f_path.dentry);
+        audit_inode(NULL, f.file->f_path.dentry);
 
-        if (unlikely(!(filp->f_mode & FMODE_WRITE))) {
+        if (unlikely(!(f.file->f_mode & FMODE_WRITE))) {
                 ret = -EBADF;
                 goto out_fput;
         }
@@ -1023,7 +1023,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
         }
 
         if (info->attr.mq_curmsgs == info->attr.mq_maxmsg) {
-                if (filp->f_flags & O_NONBLOCK) {
+                if (f.file->f_flags & O_NONBLOCK) {
                         ret = -EAGAIN;
                 } else {
                         wait.task = current;
@@ -1056,7 +1056,7 @@ out_free:
         if (ret)
                 free_msg(msg_ptr);
 out_fput:
-        fput(filp);
+        fdput(f);
 out:
         return ret;
 }
@@ -1067,7 +1067,7 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
 {
         ssize_t ret;
         struct msg_msg *msg_ptr;
-        struct file *filp;
+        struct fd f;
         struct inode *inode;
         struct mqueue_inode_info *info;
         struct ext_wait_queue wait;
@@ -1084,21 +1084,21 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
 
         audit_mq_sendrecv(mqdes, msg_len, 0, timeout ? &ts : NULL);
 
-        filp = fget(mqdes);
-        if (unlikely(!filp)) {
+        f = fdget(mqdes);
+        if (unlikely(!f.file)) {
                 ret = -EBADF;
                 goto out;
         }
 
-        inode = filp->f_path.dentry->d_inode;
-        if (unlikely(filp->f_op != &mqueue_file_operations)) {
+        inode = f.file->f_path.dentry->d_inode;
+        if (unlikely(f.file->f_op != &mqueue_file_operations)) {
                 ret = -EBADF;
                 goto out_fput;
         }
         info = MQUEUE_I(inode);
-        audit_inode(NULL, filp->f_path.dentry);
+        audit_inode(NULL, f.file->f_path.dentry);
 
-        if (unlikely(!(filp->f_mode & FMODE_READ))) {
+        if (unlikely(!(f.file->f_mode & FMODE_READ))) {
                 ret = -EBADF;
                 goto out_fput;
         }
@@ -1130,7 +1130,7 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
         }
 
         if (info->attr.mq_curmsgs == 0) {
-                if (filp->f_flags & O_NONBLOCK) {
+                if (f.file->f_flags & O_NONBLOCK) {
                         spin_unlock(&info->lock);
                         ret = -EAGAIN;
                 } else {
@@ -1160,7 +1160,7 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
                 free_msg(msg_ptr);
         }
 out_fput:
-        fput(filp);
+        fdput(f);
 out:
         return ret;
 }
@@ -1174,7 +1174,7 @@ SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,
                 const struct sigevent __user *, u_notification)
 {
         int ret;
-        struct file *filp;
+        struct fd f;
         struct sock *sock;
         struct inode *inode;
         struct sigevent notification;
@@ -1220,13 +1220,13 @@ SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,
                         skb_put(nc, NOTIFY_COOKIE_LEN);
                         /* and attach it to the socket */
 retry:
-                        filp = fget(notification.sigev_signo);
-                        if (!filp) {
+                        f = fdget(notification.sigev_signo);
+                        if (!f.file) {
                                 ret = -EBADF;
                                 goto out;
                         }
-                        sock = netlink_getsockbyfilp(filp);
-                        fput(filp);
+                        sock = netlink_getsockbyfilp(f.file);
+                        fdput(f);
                         if (IS_ERR(sock)) {
                                 ret = PTR_ERR(sock);
                                 sock = NULL;
@@ -1245,14 +1245,14 @@ retry:
                 }
         }
 
-        filp = fget(mqdes);
-        if (!filp) {
+        f = fdget(mqdes);
+        if (!f.file) {
                 ret = -EBADF;
                 goto out;
         }
 
-        inode = filp->f_path.dentry->d_inode;
-        if (unlikely(filp->f_op != &mqueue_file_operations)) {
+        inode = f.file->f_path.dentry->d_inode;
+        if (unlikely(f.file->f_op != &mqueue_file_operations)) {
                 ret = -EBADF;
                 goto out_fput;
         }
@@ -1292,7 +1292,7 @@ retry:
         }
         spin_unlock(&info->lock);
 out_fput:
-        fput(filp);
+        fdput(f);
 out:
         if (sock) {
                 netlink_detachskb(sock, nc);
@@ -1308,7 +1308,7 @@ SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
 {
         int ret;
         struct mq_attr mqstat, omqstat;
-        struct file *filp;
+        struct fd f;
         struct inode *inode;
         struct mqueue_inode_info *info;
 
@@ -1319,14 +1319,14 @@ SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
                         return -EINVAL;
         }
 
-        filp = fget(mqdes);
-        if (!filp) {
+        f = fdget(mqdes);
+        if (!f.file) {
                 ret = -EBADF;
                 goto out;
         }
 
-        inode = filp->f_path.dentry->d_inode;
-        if (unlikely(filp->f_op != &mqueue_file_operations)) {
+        inode = f.file->f_path.dentry->d_inode;
+        if (unlikely(f.file->f_op != &mqueue_file_operations)) {
                 ret = -EBADF;
                 goto out_fput;
         }
@@ -1335,15 +1335,15 @@ SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
         spin_lock(&info->lock);
 
         omqstat = info->attr;
-        omqstat.mq_flags = filp->f_flags & O_NONBLOCK;
+        omqstat.mq_flags = f.file->f_flags & O_NONBLOCK;
         if (u_mqstat) {
                 audit_mq_getsetattr(mqdes, &mqstat);
-                spin_lock(&filp->f_lock);
+                spin_lock(&f.file->f_lock);
                 if (mqstat.mq_flags & O_NONBLOCK)
-                        filp->f_flags |= O_NONBLOCK;
+                        f.file->f_flags |= O_NONBLOCK;
                 else
-                        filp->f_flags &= ~O_NONBLOCK;
-                spin_unlock(&filp->f_lock);
+                        f.file->f_flags &= ~O_NONBLOCK;
+                spin_unlock(&f.file->f_lock);
 
                 inode->i_atime = inode->i_ctime = CURRENT_TIME;
         }
@@ -1356,7 +1356,7 @@ SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,
                 ret = -EFAULT;
 
 out_fput:
-        fput(filp);
+        fdput(f);
 out:
         return ret;
 }