Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
parents a0e136e5 c02b1a9b

Documentation/filesystems/porting

+0 −4
Original line number Diff line number Diff line
@@ -501,10 +501,6 @@ in your dentry operations instead. 
	is non-NULL.  Note that link body isn't available anymore, so if you need it,

	store it as cookie.

--

[mandatory]

	__fd_install() & fd_install() can now sleep. Callers should not

	hold a spinlock	or other resources that do not allow a schedule.

--

[mandatory]

	any symlink that might use page_follow_link_light/page_put_link() must

	have inode_nohighmem(inode) called before anything might start playing with

fs/binfmt_elf_fdpic.c

+2 −0
Original line number Diff line number Diff line
@@ -1498,7 +1498,9 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm) 
	struct vm_area_struct *vma;



	for (vma = current->mm->mmap; vma; vma = vma->vm_next) {

#ifdef CONFIG_MMU

		unsigned long addr;

#endif



		if (!maydump(vma, cprm->mm_flags))

			continue;

fs/coda/upcall.c

+1 −2
Original line number Diff line number Diff line
@@ -447,8 +447,7 @@ int venus_fsync(struct super_block *sb, struct CodaFid *fid) 
	UPARG(CODA_FSYNC);



	inp->coda_fsync.VFid = *fid;

	error = coda_upcall(coda_vcp(sb), sizeof(union inputArgs),

			    &outsize, inp);

	error = coda_upcall(coda_vcp(sb), insize, &outsize, inp);



	CODA_FREE(inp, insize);

	return error;

fs/compat_ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,7 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd, 
	case FICLONE:

	case FICLONERANGE:

	case FIDEDUPERANGE:

	case FS_IOC_FIEMAP:

		goto do_ioctl;



	case FIBMAP:

fs/fhandle.c

+2 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh, 
	return retval;

}



long do_handle_open(int mountdirfd,

		    struct file_handle __user *ufh, int open_flag)

static long do_handle_open(int mountdirfd, struct file_handle __user *ufh,

			   int open_flag)

{

	long retval = 0;

	struct path path;