diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-09-02 06:10:11 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-09-02 05:17:06 -0700 |
| commit | 060380d460caa74b30eb6c0dedc8e25c64030acf (patch) | |
| tree | d8bf30b4286b3ef4e3532603a80c087b3dd3874e | |
| parent | fabe6417986dedd92adc2ac5d8d71cfd4dd918da (diff) | |
nfs3: Free vectored write args using FREE not GF_FREE
..because the file handle in write3args is allocated inside
libc using malloc not memory accounting code in glusterfs.
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1499 (GNFS from mainline Glusterfs-3.1-qa13 crashes while initiating SFS2008)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1499
| -rw-r--r-- | xlators/nfs/lib/src/xdr-nfs3.c | 3 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xlators/nfs/lib/src/xdr-nfs3.c b/xlators/nfs/lib/src/xdr-nfs3.c index 0ea23dc1cb1..97ec1b6fe79 100644 --- a/xlators/nfs/lib/src/xdr-nfs3.c +++ b/xlators/nfs/lib/src/xdr-nfs3.c @@ -1891,8 +1891,7 @@ xdr_free_write3args_nocopy (write3args *wa) if (!wa) return; - GF_FREE (wa->file.data.data_val); - GF_FREE (wa); + FREE (wa->file.data.data_val); } diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index 16a5e65218f..3aed70a97d5 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -1929,6 +1929,7 @@ nfs3svc_write_vec (rpcsvc_request_t *req, struct iobuf *iob) ret = nfs3_write (req, (struct nfs3_fh *)args->file.data.data_val, args->offset, args->count, args->stable, payload,iob); xdr_free_write3args_nocopy (args); + GF_FREE (args); if (ret < 0) { gf_log (GF_NFS3, GF_LOG_ERROR, "WRITE procedure failed"); nfs_rpcsvc_request_seterr (req, SYSTEM_ERR); |