From: Shirish Pargaonkar <[email protected]> A structure stored an rb tree is defined consisting of a SID and a id (either uid or gid) to which that SID is mapped.
Added fields needed to store this defined data structures of a rb tree to a superblock and initialized them. There are two separate trees, one for SID/uid and another one for SID/gid. Signed-off-by: Shirish Pargaonkar <[email protected]> --- fs/cifs/cifs_fs_sb.h | 4 ++++ fs/cifs/cifsacl.h | 6 ++++++ fs/cifs/cifsfs.c | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index ac51cd2..4bd0680 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h @@ -45,6 +45,10 @@ struct cifs_sb_info { struct rb_root tlink_tree; spinlock_t tlink_tree_lock; + struct rb_root uidtree; + spinlock_t siduidlock; + struct rb_root gidtree; + spinlock_t sidgidlock; struct tcon_link *master_tlink; struct nls_table *local_nls; unsigned int rsize; diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index c4ae7d0..6c26e7f 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -74,6 +74,12 @@ struct cifs_wksid { char sidname[SIDNAMELENGTH]; } __attribute__((packed)); +struct cifs_sid_id { + struct rb_node rbnode; + struct cifs_sid sid; + unsigned long id; +} __attribute__((packed)); + extern int match_sid(struct cifs_sid *); extern int compare_sids(const struct cifs_sid *, const struct cifs_sid *); diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index a8323f1..36182e3 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -122,6 +122,12 @@ cifs_read_super(struct super_block *sb, void *data, spin_lock_init(&cifs_sb->tlink_tree_lock); cifs_sb->tlink_tree = RB_ROOT; + spin_lock_init(&cifs_sb->siduidlock); + cifs_sb->uidtree = RB_ROOT; + + spin_lock_init(&cifs_sb->sidgidlock); + cifs_sb->gidtree = RB_ROOT; + rc = bdi_setup_and_register(&cifs_sb->bdi, "cifs", BDI_CAP_MAP_COPY); if (rc) { kfree(cifs_sb); -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
