diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-12-26 14:23:10 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-12-26 14:23:10 +0100 |
commit | 2a340dd3310d0f67a48d6057214e54416d173265 (patch) | |
tree | fe40b56714f1d8a2e4f1ec26b6c07f1fcf396fd9 /procfs | |
parent | 5fe615a4d66f4dea48812ed9e4f250010a8f9298 (diff) |
Revert "Make sure to free content dir in procfs"
This reverts commit 5fe615a4d66f4dea48812ed9e4f250010a8f9298.
Diffstat (limited to 'procfs')
-rw-r--r-- | procfs/netfs.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/procfs/netfs.c b/procfs/netfs.c index 737abbc9..276c57cc 100644 --- a/procfs/netfs.c +++ b/procfs/netfs.c @@ -161,8 +161,6 @@ error_t netfs_get_dirents (struct iouser *cred, struct node *dir, vm_size_t bufsize, int *amt) { char *contents; - char *first_content; // Keep pointer to the dir content's buffer to free it - // at the end of the procedure ssize_t contents_len; error_t err; @@ -172,7 +170,6 @@ error_t netfs_get_dirents (struct iouser *cred, struct node *dir, err = procfs_get_contents (dir, &contents, &contents_len); if (err) return err; - first_content = contents; /* We depend on the fact that CONTENTS is terminated. */ assert (contents_len == 0 || contents[contents_len - 1] == '\0'); @@ -191,10 +188,7 @@ error_t netfs_get_dirents (struct iouser *cred, struct node *dir, { char *n = mmap (0, *datacnt, PROT_READ | PROT_WRITE, MAP_ANONYMOUS, 0, 0); if (n == MAP_FAILED) - { - free (first_content); - return ENOMEM; - } + return ENOMEM; *data = n; } @@ -202,7 +196,6 @@ error_t netfs_get_dirents (struct iouser *cred, struct node *dir, /* Do the actual conversion. */ *amt = putentries (contents, contents_len, nentries, *data, datacnt); - free (first_content); return 0; } |