Skip to content
Snippets Groups Projects
Commit 49578be4 authored by Johann Lombardi's avatar Johann Lombardi
Browse files

Branch b1_6

b=14007
i=nathan
i=tappro

check for MDS_OPEN_OWNEROVERRIDE in attr_pack()/attr_unpack()
since it is used in mds_fix_attr() (see bug 5781) for NFS.
parent b87236a1
No related branches found
No related tags found
No related merge requests found
...@@ -215,6 +215,9 @@ static inline __u64 attr_pack(unsigned int ia_valid) { ...@@ -215,6 +215,9 @@ static inline __u64 attr_pack(unsigned int ia_valid) {
sa_valid |= MDS_ATTR_CTIME_SET; sa_valid |= MDS_ATTR_CTIME_SET;
if (ia_valid & ATTR_FROM_OPEN) if (ia_valid & ATTR_FROM_OPEN)
sa_valid |= MDS_ATTR_FROM_OPEN; sa_valid |= MDS_ATTR_FROM_OPEN;
if (ia_valid & MDS_OPEN_OWNEROVERRIDE)
/* NFSD hack (see bug 5781) */
sa_valid |= MDS_OPEN_OWNEROVERRIDE;
return sa_valid; return sa_valid;
} }
......
...@@ -125,6 +125,8 @@ static inline unsigned int attr_unpack(__u64 sa_valid) { ...@@ -125,6 +125,8 @@ static inline unsigned int attr_unpack(__u64 sa_valid) {
ia_valid |= ATTR_CTIME_SET; ia_valid |= ATTR_CTIME_SET;
if (sa_valid & MDS_ATTR_FROM_OPEN) if (sa_valid & MDS_ATTR_FROM_OPEN)
ia_valid |= ATTR_FROM_OPEN; ia_valid |= ATTR_FROM_OPEN;
if (sa_valid & MDS_OPEN_OWNEROVERRIDE)
ia_valid |= MDS_OPEN_OWNEROVERRIDE;
return ia_valid; return ia_valid;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment