Commit aab174f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents ca41cc96 2bd2c194

arch/alpha/kernel/osf_sys.c

+5 −8
Original line number Diff line number Diff line
@@ -145,27 +145,24 @@ SYSCALL_DEFINE4(osf_getdirentries, unsigned int, fd, 
		long __user *, basep)

{

	int error;

	struct file *file;

	struct fd arg = fdget(fd);

	struct osf_dirent_callback buf;



	error = -EBADF;

	file = fget(fd);

	if (!file)

		goto out;

	if (!arg.file)

		return -EBADF;



	buf.dirent = dirent;

	buf.basep = basep;

	buf.count = count;

	buf.error = 0;



	error = vfs_readdir(file, osf_filldir, &buf);

	error = vfs_readdir(arg.file, osf_filldir, &buf);

	if (error >= 0)

		error = buf.error;

	if (count != buf.count)

		error = count - buf.count;



	fput(file);

 out:

	fdput(arg);

	return error;

}

arch/ia64/kernel/perfmon.c

+8 −10
Original line number Diff line number Diff line
@@ -2306,7 +2306,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t 
	 * partially initialize the vma for the sampling buffer

	 */

	vma->vm_mm	     = mm;

	vma->vm_file	     = filp;

	vma->vm_file	     = get_file(filp);

	vma->vm_flags	     = VM_READ| VM_MAYREAD |VM_RESERVED;

	vma->vm_page_prot    = PAGE_READONLY; /* XXX may need to change */
@@ -2345,8 +2345,6 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t 
		goto error;

	}



	get_file(filp);



	/*

	 * now insert the vma in the vm list for the process, must be

	 * done with mmap lock held
@@ -4782,7 +4780,7 @@ recheck: 
asmlinkage long

sys_perfmonctl (int fd, int cmd, void __user *arg, int count)

{

	struct file *file = NULL;

	struct fd f = {NULL, 0};

	pfm_context_t *ctx = NULL;

	unsigned long flags = 0UL;

	void *args_k = NULL;
@@ -4879,17 +4877,17 @@ restart_args: 


	ret = -EBADF;



	file = fget(fd);

	if (unlikely(file == NULL)) {

	f = fdget(fd);

	if (unlikely(f.file == NULL)) {

		DPRINT(("invalid fd %d\n", fd));

		goto error_args;

	}

	if (unlikely(PFM_IS_FILE(file) == 0)) {

	if (unlikely(PFM_IS_FILE(f.file) == 0)) {

		DPRINT(("fd %d not related to perfmon\n", fd));

		goto error_args;

	}



	ctx = file->private_data;

	ctx = f.file->private_data;

	if (unlikely(ctx == NULL)) {

		DPRINT(("no context for fd %d\n", fd));

		goto error_args;
@@ -4919,8 +4917,8 @@ abort_locked: 
	if (call_made && PFM_CMD_RW_ARG(cmd) && copy_to_user(arg, args_k, base_sz*count)) ret = -EFAULT;



error_args:

	if (file)

		fput(file);

	if (f.file)

		fdput(f);



	kfree(args_k);

arch/parisc/hpux/fs.c

+8 −9
Original line number Diff line number Diff line
@@ -109,33 +109,32 @@ Efault: 


int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned int count)

{

	struct file * file;

	struct fd arg;

	struct hpux_dirent __user * lastdirent;

	struct getdents_callback buf;

	int error = -EBADF;

	int error;



	file = fget(fd);

	if (!file)

		goto out;

	arg = fdget(fd);

	if (!arg.file)

		return -EBADF;



	buf.current_dir = dirent;

	buf.previous = NULL;

	buf.count = count;

	buf.error = 0;



	error = vfs_readdir(file, filldir, &buf);

	error = vfs_readdir(arg.file, filldir, &buf);

	if (error >= 0)

		error = buf.error;

	lastdirent = buf.previous;

	if (lastdirent) {

		if (put_user(file->f_pos, &lastdirent->d_off))

		if (put_user(arg.file->f_pos, &lastdirent->d_off))

			error = -EFAULT;

		else

			error = count - buf.count;

	}



	fput(file);

out:

	fdput(arg);

	return error;

}

arch/powerpc/include/asm/systbl.h

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ SYSCALL_SPU(getcwd) 
SYSCALL_SPU(capget)

SYSCALL_SPU(capset)

COMPAT_SYS(sigaltstack)

SYSX_SPU(sys_sendfile64,compat_sys_sendfile,sys_sendfile)

SYSX_SPU(sys_sendfile,compat_sys_sendfile_wrapper,sys_sendfile)

SYSCALL(ni_syscall)

SYSCALL(ni_syscall)

PPC_SYS(vfork)
@@ -229,7 +229,7 @@ COMPAT_SYS_SPU(sched_setaffinity) 
COMPAT_SYS_SPU(sched_getaffinity)

SYSCALL(ni_syscall)

SYSCALL(ni_syscall)

SYS32ONLY(sendfile64)

SYSX(sys_ni_syscall,compat_sys_sendfile64_wrapper,sys_sendfile64)

COMPAT_SYS_SPU(io_setup)

SYSCALL_SPU(io_destroy)

COMPAT_SYS_SPU(io_getevents)

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ 
#define __ARCH_WANT_COMPAT_SYS_TIME

#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND

#define __ARCH_WANT_SYS_NEWFSTATAT

#define __ARCH_WANT_COMPAT_SYS_SENDFILE

#endif



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE