diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 14:45:08 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 14:45:08 +0200 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/binfmt_misc.c | |
| parent | [GFS2] inode-diet: Eliminate i_blksize from the inode structure (diff) | |
| parent | pccard_store_cis: fix wrong error handling (diff) | |
| download | linux-59458f40e25915a355d8b1d701425fe9f4f9ea23.tar.xz linux-59458f40e25915a355d8b1d701425fe9f4f9ea23.zip | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/binfmt_misc.c')
| -rw-r--r-- | fs/binfmt_misc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 66ba137f8661..1713c48fef54 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -215,10 +215,8 @@ _error: bprm->interp_flags = 0; bprm->interp_data = 0; _unshare: - if (files) { - put_files_struct(current->files); - current->files = files; - } + if (files) + reset_files_struct(current, files); goto _ret; } |