git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to original version of the file. Will need to set the hangcheck
[linux-2.6.git]
/
fs
/
binfmt_flat.c
diff --git
a/fs/binfmt_flat.c
b/fs/binfmt_flat.c
index
7cd68c6
..
96ad9e0
100644
(file)
--- a/
fs/binfmt_flat.c
+++ b/
fs/binfmt_flat.c
@@
-36,7
+36,6
@@
#include <linux/init.h>
#include <linux/flat.h>
#include <linux/syscalls.h>
#include <linux/init.h>
#include <linux/flat.h>
#include <linux/syscalls.h>
-#include <linux/vs_base.h>
#include <linux/vs_memory.h>
#include <asm/byteorder.h>
#include <linux/vs_memory.h>
#include <asm/byteorder.h>
@@
-431,7
+430,7
@@
static int load_flat_file(struct linux_binprm * bprm,
int ret;
hdr = ((struct flat_hdr *) bprm->buf); /* exec-header */
int ret;
hdr = ((struct flat_hdr *) bprm->buf); /* exec-header */
- inode = bprm->file->f_dentry->d_inode;
+ inode = bprm->file->f_
path.
dentry->d_inode;
text_len = ntohl(hdr->data_start);
data_len = ntohl(hdr->data_end) - ntohl(hdr->data_start);
text_len = ntohl(hdr->data_start);
data_len = ntohl(hdr->data_end) - ntohl(hdr->data_start);