diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-18 09:13:48 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-18 09:13:48 -1000 |
| commit | 8d938105e432fe0e9f5163147e9c113190bd9d32 (patch) | |
| tree | 0151223bf265cab6143c5a972c7deaa85c7507b1 | |
| parent | aa7202c25143e76be04d9a3ed3896d38f548c29c (diff) | |
| parent | 5a8477660d9ddc090203736d7271137265cb25bb (diff) | |
| download | linux-3.10-8d938105e432fe0e9f5163147e9c113190bd9d32.tar.gz linux-3.10-8d938105e432fe0e9f5163147e9c113190bd9d32.tar.bz2 linux-3.10-8d938105e432fe0e9f5163147e9c113190bd9d32.zip | |
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()
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 6 | ||||
| -rw-r--r-- | fs/file.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 1e6956a9060..14db93e4c8a 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -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; diff --git a/fs/file.c b/fs/file.c index 708d997a774..7cb71b99260 100644 --- a/fs/file.c +++ b/fs/file.c @@ -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; |