Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

small improvement around readdir(p) #4346

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

small improvement around readdir(p) #4346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions xlators/storage/posix/src/posix-inode-fd-ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5833,9 +5833,9 @@ posix_fill_readdir(fd_t *fd, struct posix_fd *pfd, off_t off, size_t size,
return count;
}

dict_t *
posix_entry_xattr_fill(xlator_t *this, inode_t *inode, fd_t *fd,
char *entry_path, dict_t *dict, struct iatt *stbuf)
static dict_t *
posix_entry_xattr_fill(xlator_t *this, inode_t *inode, char *entry_path,
mykaul marked this conversation as resolved.
Show resolved Hide resolved
dict_t *dict, struct iatt *stbuf)
{
loc_t tmp_loc = {
0,
Expand All @@ -5847,7 +5847,7 @@ posix_entry_xattr_fill(xlator_t *this, inode_t *inode, fd_t *fd,
return posix_xattr_fill(this, entry_path, &tmp_loc, NULL, -1, dict, stbuf);
}

int
static int
posix_readdirp_fill(xlator_t *this, fd_t *fd, gf_dirent_t *entries,
dict_t *dict)
{
Expand All @@ -5859,7 +5859,7 @@ posix_readdirp_fill(xlator_t *this, fd_t *fd, gf_dirent_t *entries,
struct iatt stbuf = {
0,
};
uuid_t gfid;
static uuid_t zero_gfid = {0};
int ret = -1;
gf_boolean_t do_update_iatt_buf = _gf_false;

Expand All @@ -5884,16 +5884,14 @@ posix_readdirp_fill(xlator_t *this, fd_t *fd, gf_dirent_t *entries,

list_for_each_entry(entry, &entries->list, list)
{
inode = inode_grep(fd->inode->table, fd->inode, entry->d_name);
if (inode)
gf_uuid_copy(gfid, inode->gfid);
else
bzero(gfid, 16);

strcpy(&hpath[len + 1], entry->d_name);

ret = posix_pstat(this, inode, gfid, hpath, &stbuf, _gf_false,
_gf_true);
inode = inode_grep(itable, fd->inode, entry->d_name);
if (inode)
ret = posix_pstat(this, inode, inode->gfid, hpath, &stbuf,
_gf_false, _gf_true);
else
ret = posix_pstat(this, inode, zero_gfid, hpath, &stbuf, _gf_false, _gf_true);

if (ret == -1) {
if (inode)
Expand All @@ -5904,16 +5902,15 @@ posix_readdirp_fill(xlator_t *this, fd_t *fd, gf_dirent_t *entries,
if (do_update_iatt_buf)
posix_update_iatt_buf(&stbuf, -1, hpath);

if (!inode)
if (!inode) {
inode = inode_find(itable, stbuf.ia_gfid);

if (!inode)
inode = inode_new(itable);

if (!inode)
inode = inode_new(itable);
}
entry->inode = inode;

if (dict) {
entry->dict = posix_entry_xattr_fill(this, entry->inode, fd, hpath,
entry->dict = posix_entry_xattr_fill(this, entry->inode, hpath,
dict, &stbuf);
}

Expand All @@ -5934,7 +5931,7 @@ posix_readdirp_fill(xlator_t *this, fd_t *fd, gf_dirent_t *entries,
return 0;
}

int32_t
static int32_t
posix_do_readdir(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
off_t off, int whichop, dict_t *dict)
{
Expand Down