X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_quota.h;h=03db1da290a475822fa112c8dff04d3baf020c08;hb=64d7c036a5429a9ce5435aea96e30935b1cef44a;hp=5f92a78e3d33764900839e6b4e12d0f82bc1f01e;hpb=146676af22f226ddd8b5eb09d509e831123cc4ea;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_quota.h b/lustre/include/lustre_quota.h index 5f92a78..03db1da 100644 --- a/lustre/include/lustre_quota.h +++ b/lustre/include/lustre_quota.h @@ -51,7 +51,6 @@ #include #include #include -#include struct obd_device; struct client_obd; @@ -60,8 +59,28 @@ struct client_obd; #define NR_DQHASH 45 #endif +#ifndef QUOTABLOCK_BITS +#define QUOTABLOCK_BITS 10 +#endif + +#ifndef QUOTABLOCK_SIZE +#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS) +#endif + +#ifndef toqb +#define toqb(x) (((x) + QUOTABLOCK_SIZE - 1) >> QUOTABLOCK_BITS) +#endif + #ifdef HAVE_QUOTA_SUPPORT +#ifndef MAX_IQ_TIME +#define MAX_IQ_TIME 604800 /* (7*24*60*60) 1 week */ +#endif + +#ifndef MAX_DQ_TIME +#define MAX_DQ_TIME 604800 /* (7*24*60*60) 1 week */ +#endif + #ifdef __KERNEL__ #ifdef LPROCFS @@ -155,9 +174,9 @@ struct lustre_mem_dqblk { struct lustre_dquot { /** Hash list in memory, protect by dquot_hash_lock */ - struct list_head dq_hash; + cfs_list_t dq_hash; /** Protect the data in lustre_dquot */ - struct semaphore dq_sem; + cfs_semaphore_t dq_sem; /** Use count */ int dq_refcnt; /** Pointer of quota info it belongs to */ @@ -177,7 +196,7 @@ struct lustre_dquot { }; struct dquot_id { - struct list_head di_link; + cfs_list_t di_link; __u32 di_id; __u32 di_flag; }; @@ -202,14 +221,23 @@ int lustre_read_dquot(struct lustre_dquot *dquot); int lustre_commit_dquot(struct lustre_dquot *dquot); int lustre_init_quota_info(struct lustre_quota_info *lqi, int type); int lustre_get_qids(struct file *file, struct inode *inode, int type, - struct list_head *list); + cfs_list_t *list); int lustre_quota_convert(struct lustre_quota_info *lqi, int type); -#define LL_DQUOT_OFF(sb) DQUOT_OFF(sb) - typedef int (*dqacq_handler_t) (struct obd_device * obd, struct qunit_data * qd, int opc); +/* +#ifdef HAVE_VFS_DQ_OFF +#define LL_DQUOT_OFF(sb, remount) vfs_dq_off(sb, remount) +#else +#define LL_DQUOT_OFF(sb, remount) DQUOT_OFF(sb) +#endif +*/ + +#define LL_DQUOT_OFF(sb) DQUOT_OFF(sb) + + /* user quota is turned on on filter */ #define LQC_USRQUOTA_FLAG (1 << 0) /* group quota is turned on on filter */ @@ -236,16 +264,12 @@ struct lustre_quota_ctxt { * 0:Off, 1:On */ lqc_valid:1, /** this qctxt is valid or not */ - lqc_setup:1, /** + lqc_setup:1; /** * tell whether of not quota_type has * been processed, so that the master * knows when it can start processing * incoming acq/rel quota requests */ - lqc_immutable:1; /** - * cannot be turned on/off on-fly; - * temporary used by SOM. - */ /** }@ */ /** * original unit size of file quota and @@ -267,7 +291,7 @@ struct lustre_quota_ctxt { /** See comment of lqc_itune_sz */ unsigned long lqc_btune_sz; /** all lustre_qunit_size structures */ - struct lustre_hash *lqc_lqs_hash; + cfs_hash_t *lqc_lqs_hash; /** @{ */ /** @@ -302,7 +326,7 @@ struct lustre_quota_ctxt { */ int lqc_sync_blk; /** guard lqc_imp_valid now */ - spinlock_t lqc_lock; + cfs_spinlock_t lqc_lock; /** * when mds isn't connected, threads * on osts who send the quota reqs @@ -313,7 +337,7 @@ struct lustre_quota_ctxt { /** lquota statistics */ struct lprocfs_stats *lqc_stats; /** the number of used hashed lqs */ - atomic_t lqc_lqs; + cfs_atomic_t lqc_lqs; /** no lqs are in use */ cfs_waitq_t lqc_lqs_waitq; }; @@ -322,7 +346,7 @@ struct lustre_quota_ctxt { #define QUOTA_MASTER_UNREADY(qctxt) (qctxt)->lqc_setup = 0 struct lustre_qunit_size { - struct hlist_node lqs_hash; /** the hash entry */ + cfs_hlist_node_t lqs_hash; /** the hash entry */ unsigned int lqs_id; /** id of user/group */ unsigned long lqs_flags; /** 31st bit is QB_SET, 30th bit is QI_SET * other bits are same as LQUOTA_FLAGS_* @@ -344,10 +368,10 @@ struct lustre_qunit_size { long long lqs_ino_rec; /** when blocks are allocated/released, this value will record it */ long long lqs_blk_rec; - atomic_t lqs_refcount; + cfs_atomic_t lqs_refcount; cfs_time_t lqs_last_bshrink; /** time of last block shrink */ cfs_time_t lqs_last_ishrink; /** time of last inode shrink */ - spinlock_t lqs_lock; + cfs_spinlock_t lqs_lock; unsigned long long lqs_key; /** hash key */ struct lustre_quota_ctxt *lqs_ctxt; /** quota ctxt */ }; @@ -369,11 +393,11 @@ struct lustre_qunit_size { static inline void __lqs_getref(struct lustre_qunit_size *lqs) { - int count = atomic_inc_return(&lqs->lqs_refcount); + int count = cfs_atomic_inc_return(&lqs->lqs_refcount); if (count == 2) /* quota_create_lqs */ - atomic_inc(&lqs->lqs_ctxt->lqc_lqs); - CDEBUG(D_QUOTA, "lqs=%p refcount %d\n", lqs, count); + cfs_atomic_inc(&lqs->lqs_ctxt->lqc_lqs); + CDEBUG(D_INFO, "lqs=%p refcount %d\n", lqs, count); } static inline void lqs_getref(struct lustre_qunit_size *lqs) @@ -383,13 +407,13 @@ static inline void lqs_getref(struct lustre_qunit_size *lqs) static inline void __lqs_putref(struct lustre_qunit_size *lqs) { - LASSERT(atomic_read(&lqs->lqs_refcount) > 0); + LASSERT(cfs_atomic_read(&lqs->lqs_refcount) > 0); - if (atomic_dec_return(&lqs->lqs_refcount) == 1) - if (atomic_dec_and_test(&lqs->lqs_ctxt->lqc_lqs)) + if (cfs_atomic_dec_return(&lqs->lqs_refcount) == 1) + if (cfs_atomic_dec_and_test(&lqs->lqs_ctxt->lqc_lqs)) cfs_waitq_signal(&lqs->lqs_ctxt->lqc_lqs_waitq); - CDEBUG(D_QUOTA, "lqs=%p refcount %d\n", - lqs, atomic_read(&lqs->lqs_refcount)); + CDEBUG(D_INFO, "lqs=%p refcount %d\n", + lqs, cfs_atomic_read(&lqs->lqs_refcount)); } static inline void lqs_putref(struct lustre_qunit_size *lqs) @@ -399,7 +423,7 @@ static inline void lqs_putref(struct lustre_qunit_size *lqs) static inline void lqs_initref(struct lustre_qunit_size *lqs) { - atomic_set(&lqs->lqs_refcount, 0); + cfs_atomic_set(&lqs->lqs_refcount, 0); } #else @@ -417,7 +441,7 @@ struct lustre_quota_ctxt { #else -#define LL_DQUOT_OFF(sb) do {} while(0) +#define LL_DQUOT_OFF(sb, remount) do {} while(0) struct lustre_quota_info { }; @@ -436,7 +460,7 @@ struct quotacheck_thread_args { struct obd_device *qta_obd; /** obd device */ struct obd_quotactl qta_oqctl; /** obd_quotactl args */ struct super_block *qta_sb; /** obd super block */ - struct semaphore *qta_sem; /** obt_quotachecking */ + cfs_semaphore_t *qta_sem; /** obt_quotachecking */ }; struct obd_trans_info; @@ -497,10 +521,10 @@ typedef struct { * can finish a block_write or inode_create rpc. It updates the pending * record of block and inode, acquires quota if necessary */ - int (*quota_chkquota) (struct obd_device *, const unsigned int [], - int [], int, quota_acquire, - struct obd_trans_info *, int, struct inode *, - int); + int (*quota_chkquota) (struct obd_device *, struct obd_export *, + const unsigned int [], int [], + int, quota_acquire, struct obd_trans_info *, + int, struct inode *, int); /** * For quota client, the actions after the pending write is committed @@ -736,6 +760,7 @@ static inline int lquota_getflag(quota_interface_t *interface, #ifdef __KERNEL__ static inline int lquota_chkquota(quota_interface_t *interface, struct obd_device *obd, + struct obd_export *exp, const unsigned int id[], int pending[], int count, struct obd_trans_info *oti, int isblk, void *data, int frags) @@ -745,7 +770,7 @@ static inline int lquota_chkquota(quota_interface_t *interface, QUOTA_CHECK_OP(interface, chkquota); QUOTA_CHECK_OP(interface, acquire); - rc = QUOTA_OP(interface, chkquota)(obd, id, pending, count, + rc = QUOTA_OP(interface, chkquota)(obd, exp, id, pending, count, QUOTA_OP(interface, acquire), oti, isblk, (struct inode *)data, frags); RETURN(rc);