diff options
author | Greg Farnum <gfarnum@redhat.com> | 2016-08-03 22:06:05 +0200 |
---|---|---|
committer | Greg Farnum <gfarnum@redhat.com> | 2016-09-22 01:33:54 +0200 |
commit | fa76047910a9e500df63bb6f01c48a7d58f12858 (patch) | |
tree | 0bd1e9f9e56758c38146131e0dcabd5d6ed10bee /src/client/Inode.h | |
parent | client: include UserPerm.h in MetaRequest.h (diff) | |
download | ceph-fa76047910a9e500df63bb6f01c48a7d58f12858.tar.xz ceph-fa76047910a9e500df63bb6f01c48a7d58f12858.zip |
client: replace Inode's "best" logic with a UserPerm over gid/uid pair
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Diffstat (limited to 'src/client/Inode.h')
-rw-r--r-- | src/client/Inode.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/client/Inode.h b/src/client/Inode.h index 5115f6a794d..2c74b8b1e64 100644 --- a/src/client/Inode.h +++ b/src/client/Inode.h @@ -13,6 +13,7 @@ #include "include/assert.h" #include "InodeRef.h" +#include "UserPerm.h" class Client; struct MetaSession; @@ -37,12 +38,11 @@ struct Cap { uint64_t seq, issue_seq; __u32 mseq; // migration seq __u32 gen; - uid_t latest_uid; - gid_t latest_gid; + UserPerm latest_perms; Cap() : session(NULL), inode(NULL), cap_item(this), cap_id(0), issued(0), implemented(0), wanted(0), seq(0), issue_seq(0), mseq(0), gen(0), - latest_uid(-1), latest_gid(-1) {} + latest_perms() {} void dump(Formatter *f) const; }; @@ -279,8 +279,7 @@ struct Inode { int caps_wanted(); int caps_mds_wanted(); int caps_dirty(); - uid_t get_best_cap_uid(); - gid_t get_best_cap_gid(); + const UserPerm *get_best_perms(); bool have_valid_size(); Dir *open_dir(); |