diff options
| author | Jiffin Tony Thottan <jthottan@redhat.com> | 2015-09-07 16:46:48 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-09-07 11:20:25 -0700 |
| commit | 7b6183c36ebfe020b724c95b018a8cd535e1ecdd (patch) | |
| tree | 902770f5b7cd4f5cce80427e8b4539ffa0ecb04f | |
| parent | 53cd14b75f65ef602c766fce6ab7b8a25ca5b514 (diff) | |
uss : handle `buf` variable properly in svs_glfs_readdir()
The svs_glfs_readdir() is a generic function which is called from
svs_readdir() and svs_readdirp(). But in svs_readdir 'buf' variable
is passed as NULL, then glfs_read_readdir() will fail. This patch
will fix the same.
Change-Id: Id02e4e17e30c85de117db5ddd9f97b578622dff9
BUG: 1260611
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: http://review.gluster.org/12117
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | xlators/features/snapview-server/src/snapview-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c index b7c04bafec7..f209edd2e94 100644 --- a/xlators/features/snapview-server/src/snapview-server.c +++ b/xlators/features/snapview-server/src/snapview-server.c @@ -1241,7 +1241,6 @@ svs_glfs_readdir (xlator_t *this, glfs_fd_t *glfd, gf_dirent_t *entries, GF_VALIDATE_OR_GOTO ("svs", this, out); GF_VALIDATE_OR_GOTO (this->name, glfd, out); GF_VALIDATE_OR_GOTO (this->name, entries, out); - GF_VALIDATE_OR_GOTO (this->name, buf, out); while (filled_size < size) { in_case = glfs_telldir (glfd); @@ -1282,9 +1281,10 @@ svs_glfs_readdir (xlator_t *this, glfs_fd_t *glfd, gf_dirent_t *entries, entry->d_off = glfs_telldir (glfd); entry->d_ino = de.d_ino; entry->d_type = de.d_type; - iatt_from_stat (buf, &statbuf); - if (readdirplus) + if (readdirplus) { + iatt_from_stat (buf, &statbuf); entry->d_stat = *buf; + } list_add_tail (&entry->list, &entries->list); filled_size += this_size; |