X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_quota.h;h=b4a2314cf481a138a62c47eb3c24b86022243535;hb=d1efec944c43c93120bed1df05680e59983c41a4;hp=5e2e7afefa8b432c49ca6505768ce6263631b19f;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_quota.h b/lustre/include/lustre_quota.h index 5e2e7af..b4a2314 100644 --- a/lustre/include/lustre_quota.h +++ b/lustre/include/lustre_quota.h @@ -16,8 +16,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, * CA 95054 USA or visit www.sun.com if you need additional information or @@ -50,6 +50,8 @@ #include #include #include +#include +#include struct obd_device; struct client_obd; @@ -62,6 +64,64 @@ struct client_obd; #ifdef __KERNEL__ +#ifdef LPROCFS +enum { + LQUOTA_FIRST_STAT = 0, + /** @{ */ + /** + * these four are for measuring quota requests, for both of + * quota master and quota slaves + */ + LQUOTA_SYNC_ACQ = LQUOTA_FIRST_STAT, + LQUOTA_SYNC_REL, + LQUOTA_ASYNC_ACQ, + LQUOTA_ASYNC_REL, + /** }@ */ + /** @{ */ + /** + * these four measure how much time I/O threads spend on dealing + * with quota before and after writing data or creating files, + * only for quota slaves(lquota_chkquota and lquota_pending_commit) + */ + LQUOTA_WAIT_FOR_CHK_BLK, + LQUOTA_WAIT_FOR_CHK_INO, + LQUOTA_WAIT_FOR_COMMIT_BLK, + LQUOTA_WAIT_FOR_COMMIT_INO, + /** }@ */ + /** @{ */ + /** + * these two are for measuring time waiting return of quota reqs + * (qctxt_wait_pending_dqacq), only for quota salves + */ + LQUOTA_WAIT_PENDING_BLK_QUOTA, + LQUOTA_WAIT_PENDING_INO_QUOTA, + /** }@ */ + /** @{ */ + /** + * these two are for those when they are calling + * qctxt_wait_pending_dqacq, the quota req has returned already, + * only for quota salves + */ + LQUOTA_NOWAIT_PENDING_BLK_QUOTA, + LQUOTA_NOWAIT_PENDING_INO_QUOTA, + /** }@ */ + /** @{ */ + /** + * these are for quota ctl + */ + LQUOTA_QUOTA_CTL, + /** }@ */ + /** @{ */ + /** + * these are for adjust quota qunit, for both of + * quota master and quota slaves + */ + LQUOTA_ADJUST_QUNIT, + LQUOTA_LAST_STAT + /** }@ */ +}; +#endif /* LPROCFS */ + /* structures to access admin quotafile */ struct lustre_mem_dqinfo { unsigned int dqi_bgrace; @@ -75,28 +135,45 @@ struct lustre_mem_dqinfo { struct lustre_quota_info { struct file *qi_files[MAXQUOTAS]; struct lustre_mem_dqinfo qi_info[MAXQUOTAS]; + lustre_quota_version_t qi_version; }; #define DQ_STATUS_AVAIL 0x0 /* Available dquot */ #define DQ_STATUS_SET 0x01 /* Sombody is setting dquot */ #define DQ_STATUS_RECOVERY 0x02 /* dquot is in recovery */ +struct lustre_mem_dqblk { + __u64 dqb_bhardlimit; /**< absolute limit on disk blks alloc */ + __u64 dqb_bsoftlimit; /**< preferred limit on disk blks */ + __u64 dqb_curspace; /**< current used space */ + __u64 dqb_ihardlimit; /**< absolute limit on allocated inodes */ + __u64 dqb_isoftlimit; /**< preferred inode limit */ + __u64 dqb_curinodes; /**< current # allocated inodes */ + time_t dqb_btime; /**< time limit for excessive disk use */ + time_t dqb_itime; /**< time limit for excessive inode use */ +}; + struct lustre_dquot { - /* Hash list in memory, protect by dquot_hash_lock */ + /** Hash list in memory, protect by dquot_hash_lock */ struct list_head dq_hash; - /* Protect the data in lustre_dquot */ + /** Protect the data in lustre_dquot */ struct semaphore dq_sem; - /* Use count */ + /** Use count */ int dq_refcnt; - /* Pointer of quota info it belongs to */ + /** Pointer of quota info it belongs to */ struct lustre_quota_info *dq_info; - - loff_t dq_off; /* Offset of dquot on disk */ - unsigned int dq_id; /* ID this applies to (uid, gid) */ - int dq_type; /* Type fo quota (USRQUOTA, GRPQUOUTA) */ - unsigned short dq_status; /* See DQ_STATUS_ */ - unsigned long dq_flags; /* See DQ_ in quota.h */ - struct mem_dqblk dq_dqb; /* Diskquota usage */ + /** Offset of dquot on disk */ + loff_t dq_off; + /** ID this applies to (uid, gid) */ + unsigned int dq_id; + /** Type fo quota (USRQUOTA, GRPQUOUTA) */ + int dq_type; + /** See DQ_STATUS_ */ + unsigned short dq_status; + /** See DQ_ in quota.h */ + unsigned long dq_flags; + /** Diskquota usage */ + struct lustre_mem_dqblk dq_dqb; }; struct dquot_id { @@ -110,6 +187,7 @@ struct dquot_id { #define QFILE_INIT_INFO 4 #define QFILE_RD_DQUOT 5 #define QFILE_WR_DQUOT 6 +#define QFILE_CONVERT 7 /* admin quotafile operations */ int lustre_check_quota_file(struct lustre_quota_info *lqi, int type); @@ -118,29 +196,184 @@ int lustre_write_quota_info(struct lustre_quota_info *lqi, int type); 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, +int lustre_get_qids(struct file *file, struct inode *inode, int type, struct list_head *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); + +/* user quota is turned on on filter */ +#define LQC_USRQUOTA_FLAG (1 << 0) +/* group quota is turned on on filter */ +#define LQC_GRPQUOTA_FLAG (1 << 1) + +#define UGQUOTA2LQC(id) ((Q_TYPEMATCH(id, USRQUOTA) ? LQC_USRQUOTA_FLAG : 0) | \ + (Q_TYPEMATCH(id, GRPQUOTA) ? LQC_GRPQUOTA_FLAG : 0)) + struct lustre_quota_ctxt { - struct super_block *lqc_sb; /* superblock this applies to */ - struct obd_import *lqc_import; /* import used to send dqacq/dqrel RPC */ - dqacq_handler_t lqc_handler; /* dqacq/dqrel RPC handler, only for quota master */ - unsigned long lqc_recovery:1, /* Doing recovery */ - lqc_atype:2, /* Turn on user/group quota at setup automatically, - * 0: none, 1: user quota, 2: group quota, 3: both */ - lqc_status:1; /* Quota status. 0:Off, 1:On */ - unsigned long lqc_iunit_sz; /* Unit size of file quota */ - unsigned long lqc_itune_sz; /* Trigger dqacq when available file quota less than - * this value, trigger dqrel when available file quota - * more than this value + 1 iunit */ - unsigned long lqc_bunit_sz; /* Unit size of block quota */ - unsigned long lqc_btune_sz; /* See comment of lqc_itune_sz */ + /** superblock this applies to */ + struct super_block *lqc_sb; + /** obd_device_target for obt_rwsem */ + struct obd_device_target *lqc_obt; + /** import used to send dqacq/dqrel RPC */ + struct obd_import *lqc_import; + /** dqacq/dqrel RPC handler, only for quota master */ + dqacq_handler_t lqc_handler; + /** quota flags */ + unsigned long lqc_flags; + /** @{ */ + unsigned long lqc_recovery:1, /** Doing recovery */ + lqc_switch_qs:1, /** + * the function of change qunit size + * 0:Off, 1:On + */ + lqc_valid:1, /** this qctxt is valid or not */ + 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 + */ + /** }@ */ + /** + * original unit size of file quota and + * upper limitation for adjust file qunit + */ + unsigned long lqc_iunit_sz; + /** + * Trigger dqacq when available file + * quota less than this value, trigger + * dqrel when available file quota + * more than this value + 1 iunit + */ + unsigned long lqc_itune_sz; + /** + * original unit size of block quota and + * upper limitation for adjust block qunit + */ + unsigned long lqc_bunit_sz; + /** See comment of lqc_itune_sz */ + unsigned long lqc_btune_sz; + /** all lustre_qunit_size structures */ + struct lustre_hash *lqc_lqs_hash; + + /** @{ */ + /** + * the values below are relative to how master change its qunit sizes + */ + /** + * this affects the boundary of + * shrinking and enlarging qunit size. default=4 + */ + unsigned long lqc_cqs_boundary_factor; + /** the least value of block qunit */ + unsigned long lqc_cqs_least_bunit; + /** the least value of inode qunit */ + unsigned long lqc_cqs_least_iunit; + /** + * when enlarging, qunit size will + * mutilple it; when shrinking, + * qunit size will divide it + */ + unsigned long lqc_cqs_qs_factor; + /** + * avoid ping-pong effect of + * adjusting qunit size. How many + * seconds must be waited between + * enlarging and shinking qunit + */ + /** }@ */ + int lqc_switch_seconds; + /** + * when blk qunit reaches this value, + * later write reqs from client should be sync b=16642 + */ + int lqc_sync_blk; + /** guard lqc_imp_valid now */ + spinlock_t lqc_lock; + /** + * when mds isn't connected, threads + * on osts who send the quota reqs + * with wait==1 will be put here b=14840 + */ + cfs_waitq_t lqc_wait_for_qmaster; + struct proc_dir_entry *lqc_proc_dir; + /** lquota statistics */ + struct lprocfs_stats *lqc_stats; +}; + +#define QUOTA_MASTER_READY(qctxt) (qctxt)->lqc_setup = 1 +#define QUOTA_MASTER_UNREADY(qctxt) (qctxt)->lqc_setup = 0 + +struct lustre_qunit_size { + struct hlist_node lqs_hash; /** the hash entry */ + unsigned int lqs_id; /** id of user/group */ + unsigned long lqs_flags; /** is user/group; FULLBUF or LESSBUF */ + unsigned long lqs_iunit_sz; /** Unit size of file quota currently */ + /** + * Trigger dqacq when available file quota + * less than this value, trigger dqrel + * when more than this value + 1 iunit + */ + unsigned long lqs_itune_sz; + unsigned long lqs_bunit_sz; /** Unit size of block quota currently */ + unsigned long lqs_btune_sz; /** See comment of lqs itune sz */ + /** the blocks reached ost and don't finish */ + unsigned long lqs_bwrite_pending; + /** the inodes reached mds and don't finish */ + unsigned long lqs_iwrite_pending; + /** when inodes are allocated/released, this value will record it */ + 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_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; + struct quota_adjust_qunit lqs_key; /** hash key */ + struct lustre_quota_ctxt *lqs_ctxt; /** quota ctxt */ }; +#define LQS_IS_GRP(lqs) ((lqs)->lqs_flags & LQUOTA_FLAGS_GRP) +#define LQS_IS_ADJBLK(lqs) ((lqs)->lqs_flags & LQUOTA_FLAGS_ADJBLK) +#define LQS_IS_ADJINO(lqs) ((lqs)->lqs_flags & LQUOTA_FLAGS_ADJINO) + +#define LQS_SET_GRP(lqs) ((lqs)->lqs_flags |= LQUOTA_FLAGS_GRP) +#define LQS_SET_ADJBLK(lqs) ((lqs)->lqs_flags |= LQUOTA_FLAGS_ADJBLK) +#define LQS_SET_ADJINO(lqs) ((lqs)->lqs_flags |= LQUOTA_FLAGS_ADJINO) + +static inline void lqs_getref(struct lustre_qunit_size *lqs) +{ + atomic_inc(&lqs->lqs_refcount); + CDEBUG(D_QUOTA, "lqs=%p refcount %d\n", + lqs, atomic_read(&lqs->lqs_refcount)); +} + +static inline void lqs_putref(struct lustre_qunit_size *lqs) +{ + LASSERT(atomic_read(&lqs->lqs_refcount) > 0); + + /* killing last ref, let's let hash table kill it */ + if (atomic_read(&lqs->lqs_refcount) == 1) { + lustre_hash_del(lqs->lqs_ctxt->lqc_lqs_hash, + &lqs->lqs_key, &lqs->lqs_hash); + OBD_FREE_PTR(lqs); + } else { + atomic_dec(&lqs->lqs_refcount); + CDEBUG(D_QUOTA, "lqs=%p refcount %d\n", + lqs, atomic_read(&lqs->lqs_refcount)); + + } +} + +static inline void lqs_initref(struct lustre_qunit_size *lqs) +{ + atomic_set(&lqs->lqs_refcount, 0); +} + #else struct lustre_quota_info { @@ -149,6 +382,9 @@ struct lustre_quota_info { struct lustre_quota_ctxt { }; +#define QUOTA_MASTER_READY(qctxt) +#define QUOTA_MASTER_UNREADY(qctxt) + #endif /* !__KERNEL__ */ #else @@ -168,58 +404,112 @@ struct lustre_quota_ctxt { #define MIN_QLIMIT 1 struct quotacheck_thread_args { - struct obd_export *qta_exp; /* obd export */ - struct obd_quotactl qta_oqctl; /* obd_quotactl args */ - struct super_block *qta_sb; /* obd super block */ - atomic_t *qta_sem; /* obt_quotachecking */ + struct obd_export *qta_exp; /** obd export */ + struct obd_device *qta_obd; /** obd device */ + struct obd_quotactl qta_oqctl; /** obd_quotactl args */ + struct super_block *qta_sb; /** obd super block */ + atomic_t *qta_sem; /** obt_quotachecking */ }; +struct obd_trans_info; +typedef int (*quota_acquire)(struct obd_device *obd, unsigned int uid, + unsigned int gid, struct obd_trans_info *oti, + int isblk); + typedef struct { int (*quota_init) (void); int (*quota_exit) (void); int (*quota_setup) (struct obd_device *); int (*quota_cleanup) (struct obd_device *); - /* For quota master, close admin quota files */ + /** + * For quota master, close admin quota files + */ int (*quota_fs_cleanup) (struct obd_device *); - int (*quota_ctl) (struct obd_export *, struct obd_quotactl *); - int (*quota_check) (struct obd_export *, struct obd_quotactl *); + int (*quota_ctl) (struct obd_device *, struct obd_export *, + struct obd_quotactl *); + int (*quota_check) (struct obd_device *, struct obd_export *, + struct obd_quotactl *); int (*quota_recovery) (struct obd_device *); - - /* For quota master/slave, adjust quota limit after fs operation */ - int (*quota_adjust) (struct obd_device *, unsigned int[], - unsigned int[], int, int); - - /* For quota slave, set import, trigger quota recovery */ - int (*quota_setinfo) (struct obd_export *, struct obd_device *); - - /* For quota slave, set proper thread resoure capability */ + + /** + * For quota master/slave, adjust quota limit after fs operation + */ + int (*quota_adjust) (struct obd_device *, unsigned int[], + unsigned int[], int, int); + + /** + * For quota slave, set import, trigger quota recovery, + * For quota master, set lqc_setup + */ + int (*quota_setinfo) (struct obd_device *, void *); + + /** + * For quota slave, clear import when relative import is invalid + */ + int (*quota_clearinfo) (struct obd_export *, struct obd_device *); + + /** + * For quota slave, set proper thread resoure capability + */ int (*quota_enforce) (struct obd_device *, unsigned int); - - /* For quota slave, check whether specified uid/gid is over quota */ + + /** + * For quota slave, check whether specified uid/gid is over quota + */ int (*quota_getflag) (struct obd_device *, struct obdo *); - - /* For quota slave, acquire/release quota from master if needed */ - int (*quota_acquire) (struct obd_device *, unsigned int, unsigned int); - - /* For quota slave, check whether specified uid/gid's remaining quota - * can finish a write rpc */ + +#ifdef __KERNEL__ + /** + * For quota slave, acquire/release quota from master if needed + */ + int (*quota_acquire) (struct obd_device *, unsigned int, unsigned int, + struct obd_trans_info *, int); + + /** + * For quota slave, check whether specified uid/gid's remaining quota + * 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 *, unsigned int, unsigned int, + int, int *, quota_acquire, + struct obd_trans_info *, int, struct inode *, int); - /* For quota client, poll if the quota check done */ + /** + * For quota client, the actions after the pending write is committed + */ + int (*quota_pending_commit) (struct obd_device *, unsigned int, + unsigned int, int, int); +#endif + + /** + * For quota client, poll if the quota check done + */ int (*quota_poll_check) (struct obd_export *, struct if_quotacheck *); - - /* For quota client, check whether specified uid/gid is over quota */ + + /** + * For quota client, check whether specified uid/gid is over quota + */ int (*quota_chkdq) (struct client_obd *, unsigned int, unsigned int); - - /* For quota client, set over quota flag for specifed uid/gid */ + + /** + * For quota client, set over quota flag for specifed uid/gid + */ int (*quota_setdq) (struct client_obd *, unsigned int, unsigned int, obd_flag, obd_flag); + + /** + * For adjusting qunit size b=10600 + */ + int (*quota_adjust_qunit) (struct obd_export *exp, + struct quota_adjust_qunit *oqaq, + struct lustre_quota_ctxt *qctxt); + } quota_interface_t; #define Q_COPY(out, in, member) (out)->member = (in)->member -#define QUOTA_OP(interface, op) interface->quota_ ## op +#define QUOTA_OP(interface, op) interface->quota_ ## op #define QUOTA_CHECK_OP(interface, op) \ do { \ @@ -235,39 +525,39 @@ static inline int lquota_init(quota_interface_t *interface) { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, init); rc = QUOTA_OP(interface, init)(); RETURN(rc); } -static inline int lquota_exit(quota_interface_t *interface) +static inline int lquota_exit(quota_interface_t *interface) { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, exit); rc = QUOTA_OP(interface, exit)(); RETURN(rc); } static inline int lquota_setup(quota_interface_t *interface, - struct obd_device *obd) + struct obd_device *obd) { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, setup); rc = QUOTA_OP(interface, setup)(obd); RETURN(rc); } static inline int lquota_cleanup(quota_interface_t *interface, - struct obd_device *obd) + struct obd_device *obd) { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, cleanup); rc = QUOTA_OP(interface, cleanup)(obd); RETURN(rc); @@ -278,32 +568,57 @@ static inline int lquota_fs_cleanup(quota_interface_t *interface, { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, fs_cleanup); rc = QUOTA_OP(interface, fs_cleanup)(obd); RETURN(rc); } static inline int lquota_recovery(quota_interface_t *interface, - struct obd_device *obd) -{ + struct obd_device *obd) +{ int rc; ENTRY; - + QUOTA_CHECK_OP(interface, recovery); rc = QUOTA_OP(interface, recovery)(obd); RETURN(rc); } +static inline int lquota_check(quota_interface_t *interface, + struct obd_device *obd, + struct obd_export *exp, + struct obd_quotactl *oqctl) +{ + int rc; + ENTRY; + + QUOTA_CHECK_OP(interface, check); + rc = QUOTA_OP(interface, check)(obd, exp, oqctl); + RETURN(rc); +} + +static inline int lquota_ctl(quota_interface_t *interface, + struct obd_device *obd, + struct obd_quotactl *oqctl) +{ + int rc; + ENTRY; + + QUOTA_CHECK_OP(interface, ctl); + rc = QUOTA_OP(interface, ctl)(obd, NULL, oqctl); + RETURN(rc); +} + static inline int lquota_adjust(quota_interface_t *interface, - struct obd_device *obd, - unsigned int qcids[], - unsigned int qpids[], - int rc, int opc) + struct obd_device *obd, + unsigned int qcids[], + unsigned int qpids[], + int rc, int opc) { int ret; ENTRY; - + QUOTA_CHECK_OP(interface, adjust); ret = QUOTA_OP(interface, adjust)(obd, qcids, qpids, rc, opc); RETURN(ret); @@ -315,7 +630,7 @@ static inline int lquota_chkdq(quota_interface_t *interface, { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, chkdq); rc = QUOTA_OP(interface, chkdq)(cli, uid, gid); RETURN(rc); @@ -328,7 +643,7 @@ static inline int lquota_setdq(quota_interface_t *interface, { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, setdq); rc = QUOTA_OP(interface, setdq)(cli, uid, gid, valid, flags); RETURN(rc); @@ -340,26 +655,37 @@ static inline int lquota_poll_check(quota_interface_t *interface, { int rc; ENTRY; - + QUOTA_CHECK_OP(interface, poll_check); rc = QUOTA_OP(interface, poll_check)(exp, qchk); RETURN(rc); } - static inline int lquota_setinfo(quota_interface_t *interface, - struct obd_export *exp, - struct obd_device *obd) + struct obd_device *obd, + void *data) { int rc; ENTRY; QUOTA_CHECK_OP(interface, setinfo); - rc = QUOTA_OP(interface, setinfo)(exp, obd); + rc = QUOTA_OP(interface, setinfo)(obd, data); RETURN(rc); } -static inline int lquota_enforce(quota_interface_t *interface, +static inline int lquota_clearinfo(quota_interface_t *interface, + struct obd_export *exp, + struct obd_device *obd) +{ + int rc; + ENTRY; + + QUOTA_CHECK_OP(interface, clearinfo); + rc = QUOTA_OP(interface, clearinfo)(exp, obd); + RETURN(rc); +} + +static inline int lquota_enforce(quota_interface_t *interface, struct obd_device *obd, unsigned int ignore) { @@ -381,57 +707,62 @@ static inline int lquota_getflag(quota_interface_t *interface, rc = QUOTA_OP(interface, getflag)(obd, oa); RETURN(rc); } - -static inline int lquota_acquire(quota_interface_t *interface, - struct obd_device *obd, - unsigned int uid, unsigned int gid) + +#ifdef __KERNEL__ +static inline int lquota_chkquota(quota_interface_t *interface, + struct obd_device *obd, + unsigned int uid, unsigned int gid, int count, + int *flag, struct obd_trans_info *oti, + int isblk, void *data, int frags) { int rc; ENTRY; + QUOTA_CHECK_OP(interface, chkquota); QUOTA_CHECK_OP(interface, acquire); - rc = QUOTA_OP(interface, acquire)(obd, uid, gid); + rc = QUOTA_OP(interface, chkquota)(obd, uid, gid, count, flag, + QUOTA_OP(interface, acquire), oti, + isblk, (struct inode *)data, frags); RETURN(rc); } -static inline int lquota_chkquota(quota_interface_t *interface, - struct obd_device *obd, - unsigned int uid, unsigned int gid, - int npage) +static inline int lquota_pending_commit(quota_interface_t *interface, + struct obd_device *obd, + unsigned int uid, unsigned int gid, + int pending, int isblk) { int rc; ENTRY; - - QUOTA_CHECK_OP(interface, chkquota); - rc = QUOTA_OP(interface, chkquota)(obd, uid, gid, npage); + + QUOTA_CHECK_OP(interface, pending_commit); + rc = QUOTA_OP(interface, pending_commit)(obd, uid, gid, pending, isblk); RETURN(rc); } - -int lprocfs_rd_bunit(char *page, char **start, off_t off, int count, - int *eof, void *data); -int lprocfs_rd_iunit(char *page, char **start, off_t off, int count, - int *eof, void *data); -int lprocfs_wr_bunit(struct file *file, const char *buffer, - unsigned long count, void *data); -int lprocfs_wr_iunit(struct file *file, const char *buffer, - unsigned long count, void *data); -int lprocfs_rd_btune(char *page, char **start, off_t off, int count, - int *eof, void *data); -int lprocfs_rd_itune(char *page, char **start, off_t off, int count, - int *eof, void *data); -int lprocfs_wr_btune(struct file *file, const char *buffer, - unsigned long count, void *data); -int lprocfs_wr_itune(struct file *file, const char *buffer, - unsigned long count, void *data); -int lprocfs_rd_type(char *page, char **start, off_t off, int count, - int *eof, void *data); -int lprocfs_wr_type(struct file *file, const char *buffer, - unsigned long count, void *data); +#endif #ifndef __KERNEL__ extern quota_interface_t osc_quota_interface; -extern quota_interface_t mdc_quota_interface; extern quota_interface_t lov_quota_interface; +extern quota_interface_t mdc_quota_interface; +extern quota_interface_t lmv_quota_interface; + +#ifndef MAXQUOTAS +#define MAXQUOTAS 2 +#endif + +#ifndef USRQUOTA +#define USRQUOTA 0 +#endif + +#ifndef GRPQUOTA +#define GRPQUOTA 1 +#endif + #endif +#define LUSTRE_ADMIN_QUOTAFILES_V2 {\ + "admin_quotafile_v2.usr", /** user admin quotafile */\ + "admin_quotafile_v2.grp" /** group admin quotafile */\ +} + #endif /* _LUSTRE_QUOTA_H */