diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-18 20:13:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-18 20:13:48 +0100 |
| commit | 8d938105e432fe0e9f5163147e9c113190bd9d32 (patch) | |
| tree | 0151223bf265cab6143c5a972c7deaa85c7507b1 /fs | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee... (diff) | |
| parent | kill bogus BUG_ON() in do_close_on_exec() (diff) | |
| download | linux-8d938105e432fe0e9f5163147e9c113190bd9d32.tar.xz linux-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()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c index 708d997a7748..7cb71b992603 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; |