Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (bc84e0a1) · Commits · 戴 / test

fs/9p/vfs_super.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -224,11 +224,10 @@ static int v9fs_show_options(struct seq_file m, struct vfsmount mnt)
		}

		static void
		v9fs_umount_begin(struct vfsmount *vfsmnt, int flags)
		v9fs_umount_begin(struct super_block *sb)
		{
		struct v9fs_session_info *v9ses = vfsmnt->mnt_sb->s_fs_info;
		struct v9fs_session_info *v9ses = sb->s_fs_info;

		if (flags & MNT_FORCE)
		v9fs_session_cancel(v9ses);
		}

+1 −22

Original line number	Diff line number	Diff line
		@@ -543,7 +543,6 @@ static int load_elf_binary(struct linux_binprm bprm, struct pt_regs regs)
		unsigned long interp_load_addr = 0;
		unsigned long start_code, end_code, start_data, end_data;
		unsigned long reloc_func_desc = 0;
		struct files_struct *files;
		int executable_stack = EXSTACK_DEFAULT;
		unsigned long def_flags = 0;
		struct {
		@@ -593,20 +592,9 @@ static int load_elf_binary(struct linux_binprm bprm, struct pt_regs regs)
		goto out_free_ph;
		}

		files = current->files; /* Refcounted so ok */
		retval = unshare_files();
		if (retval < 0)
		goto out_free_ph;
		if (files == current->files) {
		put_files_struct(files);
		files = NULL;
		}

		/* exec will make our files private anyway, but for the a.out
		loader stuff we need to do it earlier */
		retval = get_unused_fd();
		if (retval < 0)
		goto out_free_fh;
		goto out_free_ph;
		get_file(bprm->file);
		fd_install(elf_exec_fileno = retval, bprm->file);

		@@ -728,12 +716,6 @@ static int load_elf_binary(struct linux_binprm bprm, struct pt_regs regs)
		if (retval)
		goto out_free_dentry;

		/* Discard our unneeded old files struct */
		if (files) {
		put_files_struct(files);
		files = NULL;
		}

		/* OK, This is the point of no return */
		current->flags &= ~PF_FORKNOEXEC;
		current->mm->def_flags = def_flags;
		@@ -1016,9 +998,6 @@ out_free_interp:
		kfree(elf_interpreter);
		out_free_file:
		sys_close(elf_exec_fileno);
		out_free_fh:
		if (files)
		reset_files_struct(current, files);
		out_free_ph:
		kfree(elf_phdata);
		goto out;

+1 −17

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@ static int load_misc_binary(struct linux_binprm bprm, struct pt_regs regs)
		char *iname_addr = iname;
		int retval;
		int fd_binary = -1;
		struct files_struct *files = NULL;

		retval = -ENOEXEC;
		if (!enabled)
		@@ -133,21 +132,13 @@ static int load_misc_binary(struct linux_binprm bprm, struct pt_regs regs)

		if (fmt->flags & MISC_FMT_OPEN_BINARY) {

		files = current->files;
		retval = unshare_files();
		if (retval < 0)
		goto _ret;
		if (files == current->files) {
		put_files_struct(files);
		files = NULL;
		}
		/* if the binary should be opened on behalf of the
		* interpreter than keep it open and assign descriptor
		* to it */
		fd_binary = get_unused_fd();
		if (fd_binary < 0) {
		retval = fd_binary;
		goto _unshare;
		goto _ret;
		}
		fd_install(fd_binary, bprm->file);

		@@ -205,10 +196,6 @@ static int load_misc_binary(struct linux_binprm bprm, struct pt_regs regs)
		if (retval < 0)
		goto _error;

		if (files) {
		put_files_struct(files);
		files = NULL;
		}
		_ret:
		return retval;
		_error:
		@@ -216,9 +203,6 @@ _error:
		sys_close(fd_binary);
		bprm->interp_flags = 0;
		bprm->interp_data = 0;
		_unshare:
		if (files)
		reset_files_struct(current, files);
		goto _ret;
		}

+0 −10

Original line number	Diff line number	Diff line
		@@ -194,7 +194,6 @@ load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
		unsigned long som_entry;
		struct som_hdr *som_ex;
		struct som_exec_auxhdr *hpuxhdr;
		struct files_struct *files;

		/* Get the exec-header */
		som_ex = (struct som_hdr *) bprm->buf;
		@@ -221,15 +220,6 @@ load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
		goto out_free;
		}

		files = current->files; /* Refcounted so ok */
		retval = unshare_files();
		if (retval < 0)
		goto out_free;
		if (files == current->files) {
		put_files_struct(files);
		files = NULL;
		}

		retval = get_unused_fd();
		if (retval < 0)
		goto out_free;

+21 −8

Original line number	Diff line number	Diff line
		@@ -25,14 +25,26 @@

		static LIST_HEAD(cifs_dfs_automount_list);

		/*
		* DFS functions
		*/
		static void cifs_dfs_expire_automounts(struct work_struct *work);
		static DECLARE_DELAYED_WORK(cifs_dfs_automount_task,
		cifs_dfs_expire_automounts);
		static int cifs_dfs_mountpoint_expiry_timeout = 500 * HZ;

		static void cifs_dfs_expire_automounts(struct work_struct *work)
		{
		struct list_head *list = &cifs_dfs_automount_list;

		void dfs_shrink_umount_helper(struct vfsmount *vfsmnt)
		mark_mounts_for_expiry(list);
		if (!list_empty(list))
		schedule_delayed_work(&cifs_dfs_automount_task,
		cifs_dfs_mountpoint_expiry_timeout);
		}

		void cifs_dfs_release_automount_timer(void)
		{
		mark_mounts_for_expiry(&cifs_dfs_automount_list);
		mark_mounts_for_expiry(&cifs_dfs_automount_list);
		BUG_ON(!list_empty(&cifs_dfs_automount_list));
		cancel_delayed_work(&cifs_dfs_automount_task);
		flush_scheduled_work();
		}

		/**
		@@ -261,10 +273,11 @@ static int add_mount_helper(struct vfsmount newmnt, struct nameidata nd,
		err = do_add_mount(newmnt, nd, nd->path.mnt->mnt_flags, mntlist);
		switch (err) {
		case 0:
		dput(nd->path.dentry);
		mntput(nd->path.mnt);
		path_put(&nd->path);
		nd->path.mnt = newmnt;
		nd->path.dentry = dget(newmnt->mnt_root);
		schedule_delayed_work(&cifs_dfs_automount_task,
		cifs_dfs_mountpoint_expiry_timeout);
		break;
		case -EBUSY:
		/* someone else made a mount here whilst we were busy */