diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.9.3/include/linux/vserver/dlimit.h linux-2.6.16-rc1-vs2.1.0.9.4/include/linux/vserver/dlimit.h --- linux-2.6.16-rc1-vs2.1.0.9.3/include/linux/vserver/dlimit.h 2006-01-25 05:34:51 +0100 +++ linux-2.6.16-rc1-vs2.1.0.9.4/include/linux/vserver/dlimit.h 2006-01-30 03:23:00 +0100 @@ -38,7 +38,7 @@ struct rcu_head; extern void rcu_free_dl_info(struct rcu_head *); extern void unhash_dl_info(struct dl_info *); -extern struct dl_info *locate_dl_info(struct super_block *, xid_t); +extern struct dl_info *locate_dl_info(struct super_block *, tag_t); struct kstatfs; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.9.3/kernel/vserver/dlimit.c linux-2.6.16-rc1-vs2.1.0.9.4/kernel/vserver/dlimit.c --- linux-2.6.16-rc1-vs2.1.0.9.3/kernel/vserver/dlimit.c 2006-01-25 05:34:51 +0100 +++ linux-2.6.16-rc1-vs2.1.0.9.4/kernel/vserver/dlimit.c 2006-01-30 03:22:10 +0100 @@ -87,9 +87,9 @@ struct hlist_head dl_info_hash[DL_HASH_S static spinlock_t dl_info_hash_lock = SPIN_LOCK_UNLOCKED; -static inline unsigned int __hashval(struct super_block *sb, xid_t xid) +static inline unsigned int __hashval(struct super_block *sb, tag_t tag) { - return ((xid ^ (unsigned long)sb) % DL_HASH_SIZE); + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); } @@ -148,14 +148,14 @@ static inline struct dl_info *__lookup_d } -struct dl_info *locate_dl_info(struct super_block *sb, xid_t xid) +struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag) { struct dl_info *dli; rcu_read_lock(); - dli = get_dl_info(__lookup_dl_info(sb, xid)); + dli = get_dl_info(__lookup_dl_info(sb, tag)); vxdprintk(VXD_CBIT(dlim, 7), - "locate_dl_info(%p,#%d) = %p", sb, xid, dli); + "locate_dl_info(%p,#%d) = %p", sb, tag, dli); rcu_read_unlock(); return dli; }