Commit 8d938105 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 misc VFS fixes from Al Viro:
 "Remove a bogus BUG_ON() that can trigger spuriously + alpha bits of
  do_mount() constification I'd missed during the merge window."

This pull request came in a week ago, I missed it for some reason.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kill bogus BUG_ON() in do_close_on_exec()
  missing const in alpha callers of do_mount()
parents aa7202c2 5a847766

arch/alpha/kernel/osf_sys.c

+3 −3
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ struct procfs_args { 
 * unhappy with OSF UFS. [CHECKME]

 */

static int

osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)

osf_ufs_mount(const char *dirname, struct ufs_args __user *args, int flags)

{

	int retval;

	struct cdfs_args tmp;
@@ -465,7 +465,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags) 
}



static int

osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)

osf_cdfs_mount(const char *dirname, struct cdfs_args __user *args, int flags)

{

	int retval;

	struct cdfs_args tmp;
@@ -485,7 +485,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags) 
}



static int

osf_procfs_mount(char *dirname, struct procfs_args __user *args, int flags)

osf_procfs_mount(const char *dirname, struct procfs_args __user *args, int flags)

{

	struct procfs_args tmp;

fs/file.c

+0 −1
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ void do_close_on_exec(struct files_struct *files) 
	struct fdtable *fdt;



	/* exec unshares first */

	BUG_ON(atomic_read(&files->count) != 1);

	spin_lock(&files->file_lock);

	for (i = 0; ; i++) {

		unsigned long set;

CRA Git | Maintained and supported by SUSTech CRA and CCSE