RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: Conditionally encode default dir layout.

Browse Source 
Previously we unconditionally encoded the standard layout, which
on a directory inode is meaningless. So, use that spot to fill
in the default dir layout, if it exists. Otherwise, zero-fill.
This lets us display default directory layouts without changing
the protocol, which is good.
This commit is contained in:
Greg Farnum 2010-09-29 14:18:23 -07:00
parent 212c1890ba
commit 45fa4a2f4e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mds/CInode.cc
View File

@ -1915,6 +1915,7 @@ int CInode::encode_inodestat(bufferlist& bl, Session *session,
bool pxattr = xattrlock.is_xlocked_by_client(client) || get_loner() == client;
bool plocal = versionlock.get_last_wrlock_client() == client;
bool ppolicy = policylock.is_xlocked_by_client(client) || get_loner()==client;
inode_t *i = (pfile|pauth|plink|pxattr|plocal) ? pi : oi;
i->ctime.encode_timeval(&e.ctime);
@ -1926,7 +1927,16 @@ int CInode::encode_inodestat(bufferlist& bl, Session *session,
// file
i = pfile ? pi:oi;
e.layout = i->layout;
if (is_file()) {
e.layout = i->layout;
} else {
if (ppolicy && get_projected_dir_layout())
e.layout = *get_projected_dir_layout();
else if (default_layout)
e.layout = default_layout->layout;
else
memset(&e.layout, 0, sizeof(e.layout));
}
e.size = i->size;
e.truncate_seq = i->truncate_seq;
e.truncate_size = i->truncate_size;