start the quota unification
Subsystems (4)
cover start the quota unification
Start converging the "VFS" and "XFS" style quotas into more common operations. More to follow, but let's get some comments on these simple ones first.
PATCH 1/3 cifs: drop quota operation stubs
CIFS has stubs for XFS-style quotas without an actual implementation backing them, hidden behind a config option not visible in Kconfig. Remove these stubs for now as the quota operations will see some major changes and this code simply gets in the way.
fs/cifs/cifsfs.c +0 -107
@@ -49,10 +49,6 @@#include "cifs_spnego.h" #define CIFS_MAGIC_NUMBER 0xFF534D42/* the first four bytes of SMB PDUs */ -#ifdef CONFIG_CIFS_QUOTA -static const struct quotactl_ops cifs_quotactl_ops; -#endif /* QUOTA */ -int cifsFYI =0 ;int cifsERROR =1 ;int traceSMB =0 ;
@@ -138,9 +134,6 @@ cifs_read_super(struct super_block *sb,/* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ -#ifdef CONFIG_CIFS_QUOTA - sb->s_qcop = &cifs_quotactl_ops; -#endif sb->s_blocksize =CIFS_MAX_MSGSIZE ; sb->s_blocksize_bits =14 ;/* default 2**14 = CIFS_MAX_MSGSIZE */ inode =cifs_root_iget (sb,ROOT_I );
@@ -422,106 +415,6 @@ cifs_show_options(struct seq_file *s, streturn 0 ; } -#ifdef CONFIG_CIFS_QUOTA -int cifs_xquota_set (struct super_block *sb,int quota_type,qid_t qid, -struct fs_disk_quota *pdquota) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("set type: 0x%x id: %d" , quota_type, qid)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -int cifs_xquota_get (struct super_block *sb,int quota_type,qid_t qid, -struct fs_disk_quota *pdquota) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("set type: 0x%x id: %d" , quota_type, qid)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -int cifs_xstate_set (struct super_block *sb,unsigned int flags,int operation) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("flags: 0x%x operation: 0x%x" , flags, operation)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -int cifs_xstate_get (struct super_block *sb,struct fs_quota_stat *qstats) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("pqstats %p" , qstats)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -static const struct quotactl_ops cifs_quotactl_ops = { - .set_xquota = cifs_xquota_set, - .get_xquota = cifs_xquota_get, - .set_xstate = cifs_xstate_set, - .get_xstate = cifs_xstate_get, -}; -#endif -static void cifs_umount_begin (struct super_block *sb) {struct cifs_sb_info *cifs_sb =CIFS_SB (sb);
Jan Kara
reviewerRe: [PATCH 1/3] cifs: drop quota operation stubs
Quoted 4 lines · Christoph Hellwig
CIFS has stubs for XFS-style quotas without an actual implementation backing them, hidden behind a config option not visible in
Kconfig. Remove these stubs for now as the quota operations will see some major changes and this code simply gets in the way.
I have no problem with this but maybe a word from CIFS guys would be
nice? Added to CC...
Honza
Quoted 135 lines
Signed-off-by Christoph Hellwig <[email protected]>Index:
linux-2.6/fs/cifs/cifsfs.c
===================================================================fs/cifs/cifsfs.c +0
-107@@ -49,10 +49,6 @@#include "cifs_spnego.h" #define CIFS_MAGIC_NUMBER 0xFF534D42/* the first four bytes of SMB PDUs */ -#ifdef CONFIG_CIFS_QUOTA -static const struct quotactl_ops cifs_quotactl_ops; -#endif /* QUOTA */ -int cifsFYI =0 ;int cifsERROR =1 ;int traceSMB =0 ;@@ -138,9 +134,6 @@ cifs_read_super(struct super_block *sb,/* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ -#ifdef CONFIG_CIFS_QUOTA - sb->s_qcop = &cifs_quotactl_ops; -#endif sb->s_blocksize =CIFS_MAX_MSGSIZE ; sb->s_blocksize_bits =14 ;/* default 2**14 = CIFS_MAX_MSGSIZE */ inode =cifs_root_iget (sb,ROOT_I );@@ -422,106 +415,6 @@ cifs_show_options(struct seq_file *s, streturn 0 ; } -#ifdef CONFIG_CIFS_QUOTA -int cifs_xquota_set (struct super_block *sb,int quota_type,qid_t qid, -struct fs_disk_quota *pdquota) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("set type: 0x%x id: %d" , quota_type, qid)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -int cifs_xquota_get (struct super_block *sb,int quota_type,qid_t qid, -struct fs_disk_quota *pdquota) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("set type: 0x%x id: %d" , quota_type, qid)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -int cifs_xstate_set (struct super_block *sb,unsigned int flags,int operation) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("flags: 0x%x operation: 0x%x" , flags, operation)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -int cifs_xstate_get (struct super_block *sb,struct fs_quota_stat *qstats) -{ -int xid; -int rc =0 ; -struct cifs_sb_info *cifs_sb =CIFS_SB (sb); -struct cifsTconInfo *pTcon; - -if (cifs_sb) - pTcon = cifs_sb->tcon; -else -return -EIO ; - - xid =GetXid (); -if (pTcon) { -cFYI (1 , ("pqstats %p" , qstats)); - }else - rc = -EIO ; - -FreeXid (xid); -return rc; -} - -static const struct quotactl_ops cifs_quotactl_ops = { - .set_xquota = cifs_xquota_set, - .get_xquota = cifs_xquota_get, - .set_xstate = cifs_xstate_set, - .get_xstate = cifs_xstate_get, -}; -#endif -static void cifs_umount_begin (struct super_block *sb) {struct cifs_sb_info *cifs_sb =CIFS_SB (sb);
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 1/3] cifs: drop quota operation stubs
Quoted 8 lines · Jan Kara
Quoted 1 line · Christoph Hellwig
CIFS has stubs for XFS-style quotas without an actual implementation
backing
Quoted 2 lines
them, hidden behind a config option not visible in
Kconfig. Remove these stubs for now as the quota operations will see some major changes andthis
Quoted 1 line
code simply gets in the way.
If the quota operations are changing, should be fine to remove the sutbs. I don't remember seeing a recent patch on this but will look. I was thinking of revisiting these in the smb2 module, since how to send these over the wire are better documented now, by not as high a priority as some of the other function.
Signature · 3 lines
Thanks, Steve
_______________________________________________
linux-cifs-client mailing list
[email protected]
https://lists.samba.org/mailman/listinfo/linux-cifs-client
Re: [PATCH 1/3] cifs: drop quota operation stubs
In reply to Christoph HellwigQuoted 8 lines · On Wed, 05 May 2010 06:39:38 -0400 Christoph Hellwig <[email protected]> wrote:
CIFS has stubs for XFS-style quotas without an actual implementation backing them, hidden behind a config option not visible in
Kconfig. Remove these stubs for now as the quota operations will see some major changes and this code simply gets in the way.Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me.
PATCH 2/3 quota: unify ->get_dqblk
In reply to Christoph HellwigPass the larger struct fs_disk_quota to the ->get_dqblk operation so that the Q_GETQUOTA and Q_XGETQUOTA operations can be implemented with a single filesystem operation and we can retire the ->get_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.
fs/quota/quota.c +18 -5
@@ -136,19 +136,32 @@ static int quota_setinfo(struct super_blreturn sb->s_qcop->set_info (sb, type, &info); } +static void copy_to_if_dqblk (struct if_dqblk *dst,struct fs_disk_quota *src) +{ + dst->dqb_bhardlimit = src->d_blk_hardlimit; + dst->dqb_bsoftlimit = src->d_blk_softlimit; + dst->dqb_curspace = src->d_bcount; + dst->dqb_ihardlimit = src->d_ino_hardlimit; + dst->dqb_isoftlimit = src->d_ino_softlimit; + dst->dqb_curinodes = src->d_icount; + dst->dqb_btime = src->d_btimer; + dst->dqb_itime = src->d_itimer; + dst->dqb_valid =QIF_ALL ; +} +static int quota_getquota (struct super_block *sb,int type,qid_t id,void __user *addr) { +struct fs_disk_quota fdq;struct if_dqblk idq;int ret; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->get_dqblk)return -ENOSYS ; - ret = sb->s_qcop->get_dqblk (sb, type, id, &idq); + ret = sb->s_qcop->get_dqblk (sb, type, id, &fdq);if (ret)return ret; +copy_to_if_dqblk (&idq, &fdq);if (copy_to_user (addr, &idq,sizeof (idq)))return -EFAULT ;return 0 ;
@@ -210,9 +223,9 @@ static int quota_getxquota(struct super_struct fs_disk_quota fdq;int ret; -if (!sb->s_qcop->get_xquota) +if (!sb->s_qcop->get_dqblk)return -ENOSYS ; - ret = sb->s_qcop->get_xquota (sb, type, id, &fdq); + ret = sb->s_qcop->get_dqblk (sb, type, id, &fdq);if (!ret &©_to_user (addr, &fdq,sizeof (fdq)))return -EFAULT ;return ret;
fs/gfs2/quota.c +3 -3
@@ -1432,8 +1432,8 @@ static int gfs2_quota_get_xstate(structreturn 0 ; } -static int gfs2_xquota_get (struct super_block *sb,int type,qid_t id, -struct fs_disk_quota *fdq) +static int gfs2_get_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *fdq) {struct gfs2_sbd *sdp = sb->s_fs_info;struct gfs2_quota_lvb *qlvb;
@@ -1585,7 +1585,7 @@ out_put:const struct quotactl_ops gfs2_quotactl_ops = { .quota_sync = gfs2_quota_sync, .get_xstate = gfs2_quota_get_xstate, - .get_xquota = gfs2_xquota_get, + .get_dqblk = gfs2_get_dqblk, .set_xquota = gfs2_xquota_set, };
fs/xfs/linux-2.6/xfs_quotaops.c +2 -2
@@ -97,7 +97,7 @@ xfs_fs_set_xstate( } STATIC int -xfs_fs_get_xquota( +xfs_fs_get_dqblk( struct super_block *sb, int type, qid_t id,
@@ -135,6 +135,6 @@ xfs_fs_set_xquota(const struct quotactl_ops xfs_quotactl_operations = { .get_xstate = xfs_fs_get_xstate, .set_xstate = xfs_fs_set_xstate, - .get_xquota = xfs_fs_get_xquota, + .get_dqblk = xfs_fs_get_dqblk, .set_xquota = xfs_fs_set_xquota, };
include/linux/quotaops.h +2 -1
@@ -63,7 +63,8 @@ int vfs_quota_disable(struct super_blockint vfs_quota_sync (struct super_block *sb,int type,int wait);int vfs_get_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii);int vfs_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii); -int vfs_get_dqblk (struct super_block *sb,int type,qid_t id,struct if_dqblk *di); +int vfs_get_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *di);int vfs_set_dqblk (struct super_block *sb,int type,qid_t id,struct if_dqblk *di);int dquot_transfer (struct inode *inode,struct iattr *iattr);
include/linux/quota.h +1 -2
@@ -311,11 +311,10 @@ struct quotactl_ops {int (*quota_sync)(struct super_block *,int ,int );int (*get_info)(struct super_block *,int ,struct if_dqinfo *);int (*set_info)(struct super_block *,int ,struct if_dqinfo *); -int (*get_dqblk)(struct super_block *,int ,qid_t ,struct if_dqblk *); +int (*get_dqblk)(struct super_block *,int ,qid_t ,struct fs_disk_quota *);int (*set_dqblk)(struct super_block *,int ,qid_t ,struct if_dqblk *);int (*get_xstate)(struct super_block *,struct fs_quota_stat *);int (*set_xstate)(struct super_block *,unsigned int ,int ); -int (*get_xquota)(struct super_block *,int ,qid_t ,struct fs_disk_quota *);int (*set_xquota)(struct super_block *,int ,qid_t ,struct fs_disk_quota *); };
fs/quota/dquot.c +19 -11
@@ -2286,28 +2286,36 @@ static inline qsize_t stoqb(qsize_t spac }/* Generic routine for getting common part of quota structure */ -static void do_get_dqblk (struct dquot *dquot,struct if_dqblk *di) +static void do_get_dqblk (struct dquot *dquot,struct fs_disk_quota *di) {struct mem_dqblk *dm = &dquot->dq_dqb; +memset (di,0 ,sizeof (*di)); + di->d_version =FS_DQUOT_VERSION ; + di->d_flags = dquot->dq_type ==USRQUOTA ? +XFS_USER_QUOTA :XFS_GROUP_QUOTA ; + di->d_id = dquot->dq_id; +spin_lock (&dq_data_lock); - di->dqb_bhardlimit =stoqb (dm->dqb_bhardlimit); - di->dqb_bsoftlimit =stoqb (dm->dqb_bsoftlimit); - di->dqb_curspace = dm->dqb_curspace + dm->dqb_rsvspace; - di->dqb_ihardlimit = dm->dqb_ihardlimit; - di->dqb_isoftlimit = dm->dqb_isoftlimit; - di->dqb_curinodes = dm->dqb_curinodes; - di->dqb_btime = dm->dqb_btime; - di->dqb_itime = dm->dqb_itime; - di->dqb_valid =QIF_ALL ; + di->d_blk_hardlimit =stoqb (dm->dqb_bhardlimit); + di->d_blk_softlimit =stoqb (dm->dqb_bsoftlimit); + di->d_ino_hardlimit = dm->dqb_ihardlimit; + di->d_ino_softlimit = dm->dqb_isoftlimit; + di->d_bcount = dm->dqb_curspace + dm->dqb_rsvspace; + di->d_icount = dm->dqb_curinodes; + di->d_btimer = dm->dqb_btime; + di->d_itimer = dm->dqb_itime;spin_unlock (&dq_data_lock); }int vfs_get_dqblk (struct super_block *sb,int type,qid_t id, -struct if_dqblk *di) +struct fs_disk_quota *di) {struct dquot *dquot; +if (!sb_has_quota_active (sb, type)) +return -ESRCH ; + dquot =dqget (sb, id, type);if (!dquot)return -ESRCH ;
Re: [PATCH 2/3] quota: unify ->get_dqblk
Hi,
Quoted 18 lines · Christoph Hellwig
plain text document attachment (quota-common-get_dqblk) Pass the larger struct
fs_disk_quotato the ->get_dqblk operation so that theQ_GETQUOTAandQ_XGETQUOTAoperations can be implemented with a single filesystem operation and we can retire the ->get_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.Signed-off-by Christoph Hellwig <[email protected]>Index:
linux-2.6/fs/quota/quota.c
===================================================================fs/quota/quota.c +1
-0@@ -136,19 +136,32 @@ static int quota_setinfo(struct super_blreturn sb->s_qcop->set_info (sb, type, &info); } +static void copy_to_if_dqblk (struct if_dqblk *dst,struct fs_disk_quota *src)
fs/quota/quota.c static int quota_setinfo(struct super_bl · line 149
Quoted 10 lines
fs/quota/quota.c +10
-0+{ + dst->dqb_bhardlimit = src->d_blk_hardlimit; + dst->dqb_bsoftlimit = src->d_blk_softlimit; + dst->dqb_curspace = src->d_bcount; + dst->dqb_ihardlimit = src->d_ino_hardlimit; + dst->dqb_isoftlimit = src->d_ino_softlimit; + dst->dqb_curinodes = src->d_icount; + dst->dqb_btime = src->d_btimer; + dst->dqb_itime = src->d_itimer; + dst->dqb_valid =QIF_ALL ;
Do the fields needs to be individually marked as valid according to what is supported by a filesystem or can we always assume that a zero value means unknown/unsupported?
Otherwise it looks good to me,
Steve.
Re: [PATCH 2/3] quota: unify ->get_dqblk
Quoted 3 lines · Steven Whitehouse
Do the fields needs to be individually marked as valid according to what is supported by a filesystem or can we always assume that a zero value means unknown/unsupported?
The quota-tools code assumes all fields to be valid and doesn't even check dqb_valid. It's only used for the set side.
Jan Kara
reviewerRe: [PATCH 2/3] quota: unify ->get_dqblk
In reply to Christoph HellwigQuoted 13 lines · Christoph Hellwig
Pass the larger struct
fs_disk_quotato the ->get_dqblk operation so that theQ_GETQUOTAandQ_XGETQUOTAoperations can be implemented with a single filesystem operation and we can retire the ->get_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.Signed-off-by Christoph Hellwig <[email protected]>Index:
linux-2.6/fs/quota/quota.c
===================================================================
fs/quota/quota.c static int quota_setinfo(struct super_bl · line 139
Quoted 4 lines
fs/quota/quota.c +1
-0@@ -136,19 +136,32 @@ static int quota_setinfo(struct super_blreturn sb->s_qcop->set_info (sb, type, &info); } +static void copy_to_if_dqblk (struct if_dqblk *dst,struct fs_disk_quota *src)
Could you move fs_disk_quota declaration from an XFS-specific header to
a generic one?
Quoted 8 lines
Index:
linux-2.6/fs/quota/dquot.c
===================================================================fs/quota/dquot.c +0
-0@@ -2286,28 +2286,36 @@ static inline qsize_t stoqb(qsize_t spac }/* Generic routine for getting common part of quota structure */
fs/quota/dquot.c static inline qsize_t stoqb(qsize_t spac · line 2297
Quoted 10 lines
fs/quota/dquot.c +6
-1-static void do_get_dqblk (struct dquot *dquot,struct if_dqblk *di) +static void do_get_dqblk (struct dquot *dquot,struct fs_disk_quota *di) {struct mem_dqblk *dm = &dquot->dq_dqb; +memset (di,0 ,sizeof (*di)); + di->d_version =FS_DQUOT_VERSION ; + di->d_flags = dquot->dq_type ==USRQUOTA ? +XFS_USER_QUOTA :XFS_GROUP_QUOTA ; + di->d_id = dquot->dq_id;
XFS_USER_QUOTA and XFS_GROUP_QUOTA looks awkward in the generic code...
...
fs/quota/dquot.c static inline qsize_t stoqb(qsize_t spac · line 2318
Quoted 9 lines
fs/quota/dquot.c +4
-1int vfs_get_dqblk (struct super_block *sb,int type,qid_t id, -struct if_dqblk *di) +struct fs_disk_quota *di) {struct dquot *dquot; +if (!sb_has_quota_active (sb, type)) +return -ESRCH ; +
dqget() already does this check so you can just remove it....
Quoted 4 lines
fs/quota/dquot.c +0
-0dquot =dqget (sb, id, type);if (!dquot)return -ESRCH ;
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 2/3] quota: unify ->get_dqblk
Quoted 3 lines · Jan Kara
Quoted 1 line
+static void
copy_to_if_dqblk(struct if_dqblk *dst, struct fs_disk_quota *src)Could you move
fs_disk_quotadeclaration from an XFS-specific header to
a generic one?
The only XFS-specific thing in dqblk_xfs.h is the name. Feel free to rename it to whatever better name suits you.
Quoted 6 lines
Quoted 6 lines
/* Generic routine for getting common part of quota structure */
fs/quota/dquot.c +1
-1-static void do_get_dqblk (struct dquot *dquot,struct if_dqblk *di) +static void do_get_dqblk (struct dquot *dquot,struct fs_disk_quota *di) {struct mem_dqblk *dm = &dquot->dq_dqb;
Quoted 6 lines
fs/quota/dquot.c static inline qsize_t stoqb(qsize_t spac · line 2297
Quoted 5 lines
fs/quota/dquot.c +5
-0+memset (di,0 ,sizeof (*di)); + di->d_version =FS_DQUOT_VERSION ; + di->d_flags = dquot->dq_type ==USRQUOTA ? +XFS_USER_QUOTA :XFS_GROUP_QUOTA ; + di->d_id = dquot->dq_id;
XFS_USER_QUOTAandXFS_GROUP_QUOTAlooks awkward in the generic code...
I have a patch renaming the last remaining XFS_ identifiers in dqblk_xfs.h to FS_ like the rest, but as I've just sent a gfs2 patch that touches code with these identifiers I'll hold it back until the gfs2 tree is merged.
Quoted 10 lines
fs/quota/dquot.c static inline qsize_t stoqb(qsize_t spac · line 2318
Quoted 9 lines
int vfs_get_dqblk(struct
super_block*sb, int type,qid_tid,fs/quota/dquot.c +4
-1- struct if_dqblk *di) + struct fs_disk_quota *di) {struct dquot *dquot; +if (!sb_has_quota_active (sb, type)) +return -ESRCH ; +
dqget()already does this check so you can just remove it....
Ok, fixed for the next version.
PATCH v2 2/3 quota: unify ->get_dqblk
In reply to Christoph HellwigPass the larger struct fs_disk_quota to the ->get_dqblk operation so that the Q_GETQUOTA and Q_XGETQUOTA operations can be implemented with a single filesystem operation and we can retire the ->get_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.
fs/quota/quota.c +18 -5
@@ -136,19 +136,32 @@ static int quota_setinfo(struct super_blreturn sb->s_qcop->set_info (sb, type, &info); } +static void copy_to_if_dqblk (struct if_dqblk *dst,struct fs_disk_quota *src) +{ + dst->dqb_bhardlimit = src->d_blk_hardlimit; + dst->dqb_bsoftlimit = src->d_blk_softlimit; + dst->dqb_curspace = src->d_bcount; + dst->dqb_ihardlimit = src->d_ino_hardlimit; + dst->dqb_isoftlimit = src->d_ino_softlimit; + dst->dqb_curinodes = src->d_icount; + dst->dqb_btime = src->d_btimer; + dst->dqb_itime = src->d_itimer; + dst->dqb_valid =QIF_ALL ; +} +static int quota_getquota (struct super_block *sb,int type,qid_t id,void __user *addr) { +struct fs_disk_quota fdq;struct if_dqblk idq;int ret; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->get_dqblk)return -ENOSYS ; - ret = sb->s_qcop->get_dqblk (sb, type, id, &idq); + ret = sb->s_qcop->get_dqblk (sb, type, id, &fdq);if (ret)return ret; +copy_to_if_dqblk (&idq, &fdq);if (copy_to_user (addr, &idq,sizeof (idq)))return -EFAULT ;return 0 ;
@@ -210,9 +223,9 @@ static int quota_getxquota(struct super_struct fs_disk_quota fdq;int ret; -if (!sb->s_qcop->get_xquota) +if (!sb->s_qcop->get_dqblk)return -ENOSYS ; - ret = sb->s_qcop->get_xquota (sb, type, id, &fdq); + ret = sb->s_qcop->get_dqblk (sb, type, id, &fdq);if (!ret &©_to_user (addr, &fdq,sizeof (fdq)))return -EFAULT ;return ret;
fs/gfs2/quota.c +3 -3
@@ -1432,8 +1432,8 @@ static int gfs2_quota_get_xstate(structreturn 0 ; } -static int gfs2_xquota_get (struct super_block *sb,int type,qid_t id, -struct fs_disk_quota *fdq) +static int gfs2_get_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *fdq) {struct gfs2_sbd *sdp = sb->s_fs_info;struct gfs2_quota_lvb *qlvb;
@@ -1585,7 +1585,7 @@ out_put:const struct quotactl_ops gfs2_quotactl_ops = { .quota_sync = gfs2_quota_sync, .get_xstate = gfs2_quota_get_xstate, - .get_xquota = gfs2_xquota_get, + .get_dqblk = gfs2_get_dqblk, .set_xquota = gfs2_xquota_set, };
fs/xfs/linux-2.6/xfs_quotaops.c +2 -2
@@ -97,7 +97,7 @@ xfs_fs_set_xstate( } STATIC int -xfs_fs_get_xquota( +xfs_fs_get_dqblk( struct super_block *sb, int type, qid_t id,
@@ -135,6 +135,6 @@ xfs_fs_set_xquota(const struct quotactl_ops xfs_quotactl_operations = { .get_xstate = xfs_fs_get_xstate, .set_xstate = xfs_fs_set_xstate, - .get_xquota = xfs_fs_get_xquota, + .get_dqblk = xfs_fs_get_dqblk, .set_xquota = xfs_fs_set_xquota, };
include/linux/quotaops.h +2 -1
@@ -63,7 +63,8 @@ int vfs_quota_disable(struct super_blockint vfs_quota_sync (struct super_block *sb,int type,int wait);int vfs_get_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii);int vfs_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii); -int vfs_get_dqblk (struct super_block *sb,int type,qid_t id,struct if_dqblk *di); +int vfs_get_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *di);int vfs_set_dqblk (struct super_block *sb,int type,qid_t id,struct if_dqblk *di);int dquot_transfer (struct inode *inode,struct iattr *iattr);
include/linux/quota.h +1 -2
@@ -311,11 +311,10 @@ struct quotactl_ops {int (*quota_sync)(struct super_block *,int ,int );int (*get_info)(struct super_block *,int ,struct if_dqinfo *);int (*set_info)(struct super_block *,int ,struct if_dqinfo *); -int (*get_dqblk)(struct super_block *,int ,qid_t ,struct if_dqblk *); +int (*get_dqblk)(struct super_block *,int ,qid_t ,struct fs_disk_quota *);int (*set_dqblk)(struct super_block *,int ,qid_t ,struct if_dqblk *);int (*get_xstate)(struct super_block *,struct fs_quota_stat *);int (*set_xstate)(struct super_block *,unsigned int ,int ); -int (*get_xquota)(struct super_block *,int ,qid_t ,struct fs_disk_quota *);int (*set_xquota)(struct super_block *,int ,qid_t ,struct fs_disk_quota *); };
fs/quota/dquot.c +16 -11
@@ -2286,25 +2286,30 @@ static inline qsize_t stoqb(qsize_t spac }/* Generic routine for getting common part of quota structure */ -static void do_get_dqblk (struct dquot *dquot,struct if_dqblk *di) +static void do_get_dqblk (struct dquot *dquot,struct fs_disk_quota *di) {struct mem_dqblk *dm = &dquot->dq_dqb; +memset (di,0 ,sizeof (*di)); + di->d_version =FS_DQUOT_VERSION ; + di->d_flags = dquot->dq_type ==USRQUOTA ? +XFS_USER_QUOTA :XFS_GROUP_QUOTA ; + di->d_id = dquot->dq_id; +spin_lock (&dq_data_lock); - di->dqb_bhardlimit =stoqb (dm->dqb_bhardlimit); - di->dqb_bsoftlimit =stoqb (dm->dqb_bsoftlimit); - di->dqb_curspace = dm->dqb_curspace + dm->dqb_rsvspace; - di->dqb_ihardlimit = dm->dqb_ihardlimit; - di->dqb_isoftlimit = dm->dqb_isoftlimit; - di->dqb_curinodes = dm->dqb_curinodes; - di->dqb_btime = dm->dqb_btime; - di->dqb_itime = dm->dqb_itime; - di->dqb_valid =QIF_ALL ; + di->d_blk_hardlimit =stoqb (dm->dqb_bhardlimit); + di->d_blk_softlimit =stoqb (dm->dqb_bsoftlimit); + di->d_ino_hardlimit = dm->dqb_ihardlimit; + di->d_ino_softlimit = dm->dqb_isoftlimit; + di->d_bcount = dm->dqb_curspace + dm->dqb_rsvspace; + di->d_icount = dm->dqb_curinodes; + di->d_btimer = dm->dqb_btime; + di->d_itimer = dm->dqb_itime;spin_unlock (&dq_data_lock); }int vfs_get_dqblk (struct super_block *sb,int type,qid_t id, -struct if_dqblk *di) +struct fs_disk_quota *di) {struct dquot *dquot;
PATCH 3/3 quota: unify ->set_dqblk
In reply to Christoph HellwigPass the larger struct fs_disk_quota to the ->set_dqblk operation so that the Q_SETQUOTA and Q_XSETQUOTA operations can be implemented with a single filesystem operation and we can retire the ->set_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.
Add new fieldmask values for setting the numer of blocks and inodes values which is required for the VFS quota, but wasn't for XFS.
fs/gfs2/quota.c +3 -3
@@ -1477,8 +1477,8 @@ out:/* GFS2 only supports a subset of the XFS fields */ #define GFS2_FIELDMASK (FS_DQ_BSOFT|FS_DQ_BHARD) -static int gfs2_xquota_set (struct super_block *sb,int type,qid_t id, -struct fs_disk_quota *fdq) +static int gfs2_set_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *fdq) {struct gfs2_sbd *sdp = sb->s_fs_info;struct gfs2_inode *ip =GFS2_I (sdp->sd_quota_inode);
@@ -1586,6 +1586,6 @@ const struct quotactl_ops gfs2_quotactl_ .quota_sync = gfs2_quota_sync, .get_xstate = gfs2_quota_get_xstate, .get_dqblk = gfs2_get_dqblk, - .set_xquota = gfs2_xquota_set, + .set_dqblk = gfs2_set_dqblk, };
fs/quota/quota.c +31 -5
@@ -167,18 +167,44 @@ static int quota_getquota(struct super_breturn 0 ; } +static void copy_from_if_dqblk (struct fs_disk_quota *dst,struct if_dqblk *src) +{ + dst->d_blk_hardlimit = src->dqb_bhardlimit; + dst->d_blk_softlimit = src->dqb_bsoftlimit; + dst->d_bcount = src->dqb_curspace; + dst->d_ino_hardlimit = src->dqb_ihardlimit; + dst->d_ino_softlimit = src->dqb_isoftlimit; + dst->d_icount = src->dqb_curinodes; + dst->d_btimer = src->dqb_btime; + dst->d_itimer = src->dqb_itime; + + dst->d_fieldmask =0 ; +if (src->dqb_valid &QIF_BLIMITS ) + dst->d_fieldmask |=FS_DQ_BSOFT |FS_DQ_BHARD ; +if (src->dqb_valid &QIF_SPACE ) + dst->d_fieldmask |=FS_DQ_BCOUNT ; +if (src->dqb_valid &QIF_ILIMITS ) + dst->d_fieldmask |=FS_DQ_ISOFT |FS_DQ_IHARD ; +if (src->dqb_valid &QIF_INODES ) + dst->d_fieldmask |=FS_DQ_ICOUNT ; +if (src->dqb_valid &QIF_BTIME ) + dst->d_fieldmask |=FS_DQ_BTIMER ; +if (src->dqb_valid &QIF_ITIME ) + dst->d_fieldmask |=FS_DQ_ITIMER ; +} +static int quota_setquota (struct super_block *sb,int type,qid_t id,void __user *addr) { +struct fs_disk_quota fdq;struct if_dqblk idq;if (copy_from_user (&idq, addr,sizeof (idq)))return -EFAULT ; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->set_dqblk)return -ENOSYS ; -return sb->s_qcop->set_dqblk (sb, type, id, &idq); +copy_from_if_dqblk (&fdq, &idq); +return sb->s_qcop->set_dqblk (sb, type, id, &fdq); }static int quota_setxstate (struct super_block *sb,int cmd,void __user *addr)
@@ -212,9 +238,9 @@ static int quota_setxquota(struct super_if (copy_from_user (&fdq, addr,sizeof (fdq)))return -EFAULT ; -if (!sb->s_qcop->set_xquota) +if (!sb->s_qcop->set_dqblk)return -ENOSYS ; -return sb->s_qcop->set_xquota (sb, type, id, &fdq); +return sb->s_qcop->set_dqblk (sb, type, id, &fdq); } static int quota_getxquota(struct super_block *sb, int type, qid_t id,
fs/xfs/linux-2.6/xfs_quotaops.c +2 -2
@@ -114,7 +114,7 @@ xfs_fs_get_dqblk( } STATIC int -xfs_fs_set_xquota( +xfs_fs_set_dqblk( struct super_block *sb, int type, qid_t id,
@@ -136,5 +136,5 @@ const struct quotactl_ops xfs_quotactl_o .get_xstate = xfs_fs_get_xstate, .set_xstate = xfs_fs_set_xstate, .get_dqblk = xfs_fs_get_dqblk, - .set_xquota = xfs_fs_set_xquota, + .set_dqblk = xfs_fs_set_dqblk, };
include/linux/quota.h +1 -2
@@ -312,10 +312,9 @@ struct quotactl_ops {int (*get_info)(struct super_block *,int ,struct if_dqinfo *);int (*set_info)(struct super_block *,int ,struct if_dqinfo *);int (*get_dqblk)(struct super_block *,int ,qid_t ,struct fs_disk_quota *); -int (*set_dqblk)(struct super_block *,int ,qid_t ,struct if_dqblk *); +int (*set_dqblk)(struct super_block *,int ,qid_t ,struct fs_disk_quota *);int (*get_xstate)(struct super_block *,struct fs_quota_stat *);int (*set_xstate)(struct super_block *,unsigned int ,int ); -int (*set_xquota)(struct super_block *,int ,qid_t ,struct fs_disk_quota *); };struct quota_format_type {
include/linux/quotaops.h +2 -1
@@ -65,7 +65,8 @@ int vfs_get_dqinfo(struct super_block *sint vfs_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii);int vfs_get_dqblk (struct super_block *sb,int type,qid_t id,struct fs_disk_quota *di); -int vfs_set_dqblk (struct super_block *sb,int type,qid_t id,struct if_dqblk *di); +int vfs_set_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *di);int dquot_transfer (struct inode *inode,struct iattr *iattr);int vfs_dq_quota_on_remount (struct super_block *sb);
fs/xfs/quota/xfs_qm_syscalls.c +7 -3
@@ -452,6 +452,9 @@ xfs_qm_scall_getqstat(return (0 ); } +#define XFS_DQ_MASK \ + (FS_DQ_LIMIT_MASK | FS_DQ_TIMER_MASK | FS_DQ_WARNS_MASK) +/* * Adjust quota limits, and start/stop timers accordingly. */
@@ -468,9 +471,10 @@ xfs_qm_scall_setqlim(int error;xfs_qcnt_t hard, soft; -if ((newlim->d_fieldmask & - (FS_DQ_LIMIT_MASK |FS_DQ_TIMER_MASK |FS_DQ_WARNS_MASK )) ==0 ) -return (0 ); +if (newlim->d_fieldmask & ~XFS_DQ_MASK ) +return EINVAL ; +if ((newlim->d_fieldmask &XFS_DQ_MASK ) ==0 ) +return 0 ; tp =xfs_trans_alloc (mp,XFS_TRANS_QM_SETQLIM ); if ((error = xfs_trans_reserve(tp, 0, sizeof(xfs_disk_dquot_t) + 128,
include/linux/dqblk_xfs.h +9 -0
@@ -110,6 +110,15 @@ typedef struct fs_disk_quota {#define FS_DQ_WARNS_MASK (FS_DQ_BWARNS | FS_DQ_IWARNS | FS_DQ_RTBWARNS)/* +* Accounting values. These can only be set for filesystem with +* non-transactional quotas that require quotacheck(8) in userspace. +*/ +#define FS_DQ_BCOUNT (1<<12) +#define FS_DQ_ICOUNT (1<<13) +#define FS_DQ_RTBCOUNT (1<<14) +#define FS_DQ_ACCT_MASK (FS_DQ_BCOUNT | FS_DQ_ICOUNT | FS_DQ_RTBCOUNT) + +/* * Various flags related to quotactl(2). Only relevant to XFS filesystems. */ #define XFS_QUOTA_UDQ_ACCT (1<<0)/* user quota accounting */
fs/quota/dquot.c +46 -24
122 lines not on this page · raw message
Jan Kara
reviewerRe: [PATCH 3/3] quota: unify ->set_dqblk
Quoted 11 lines · Christoph Hellwig
Pass the larger struct
fs_disk_quotato the ->set_dqblk operation so that theQ_SETQUOTAandQ_XSETQUOTAoperations can be implemented with a single filesystem operation and we can retire the ->set_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.Add new fieldmask values for setting the numer of blocks and inodes values which is required for the VFS quota, but wasn't for XFS.
Signed-off-by Christoph Hellwig <[email protected]>
Just one minor nit below...
...
fs/quota/dquot.c static int do_set_dqblk(struct dquot *dq · line 2434
Quoted 13 lines
fs/quota/dquot.c +4
-1@@ -2405,11 +2424,14 @@ static int do_set_dqblk(struct dquot *dq }int vfs_set_dqblk (struct super_block *sb,int type,qid_t id, -struct if_dqblk *di) +struct fs_disk_quota *di) {struct dquot *dquot;int rc; +if (!sb_has_quota_active (sb, type)) +return -ESRCH ; +
This is unnecessary...
fs/quota/dquot.c static int do_set_dqblk(struct dquot *dq · line 2437
Quoted 4 lines
fs/quota/dquot.c +0
-0dquot =dqget (sb, id, type);if (!dquot) { rc = -ESRCH ;
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Re: [PATCH 3/3] quota: unify ->set_dqblk
Quoted 4 lines · Jan Kara
fs/quota/dquot.c static int do_set_dqblk(struct dquot *dq · line 2434
Quoted 3 lines
fs/quota/dquot.c +3
-0+if (!sb_has_quota_active (sb, type)) +return -ESRCH ; +This is unnecessary...
Thanks, fixed for the next iteration.
PATCH v2 3/3 quota: unify ->set_dqblk
In reply to Christoph HellwigPass the larger struct fs_disk_quota to the ->set_dqblk operation so that the Q_SETQUOTA and Q_XSETQUOTA operations can be implemented with a single filesystem operation and we can retire the ->set_xquota operation. The additional information (RT-subvolume accounting and warn counts) are left zero for the VFS quota implementation.
Add new fieldmask values for setting the numer of blocks and inodes values which is required for the VFS quota, but wasn't for XFS.
fs/gfs2/quota.c +3 -3
@@ -1477,8 +1477,8 @@ out:/* GFS2 only supports a subset of the XFS fields */ #define GFS2_FIELDMASK (FS_DQ_BSOFT|FS_DQ_BHARD) -static int gfs2_xquota_set (struct super_block *sb,int type,qid_t id, -struct fs_disk_quota *fdq) +static int gfs2_set_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *fdq) {struct gfs2_sbd *sdp = sb->s_fs_info;struct gfs2_inode *ip =GFS2_I (sdp->sd_quota_inode);
@@ -1586,6 +1586,6 @@ const struct quotactl_ops gfs2_quotactl_ .quota_sync = gfs2_quota_sync, .get_xstate = gfs2_quota_get_xstate, .get_dqblk = gfs2_get_dqblk, - .set_xquota = gfs2_xquota_set, + .set_dqblk = gfs2_set_dqblk, };
fs/quota/quota.c +31 -5
@@ -167,18 +167,44 @@ static int quota_getquota(struct super_breturn 0 ; } +static void copy_from_if_dqblk (struct fs_disk_quota *dst,struct if_dqblk *src) +{ + dst->d_blk_hardlimit = src->dqb_bhardlimit; + dst->d_blk_softlimit = src->dqb_bsoftlimit; + dst->d_bcount = src->dqb_curspace; + dst->d_ino_hardlimit = src->dqb_ihardlimit; + dst->d_ino_softlimit = src->dqb_isoftlimit; + dst->d_icount = src->dqb_curinodes; + dst->d_btimer = src->dqb_btime; + dst->d_itimer = src->dqb_itime; + + dst->d_fieldmask =0 ; +if (src->dqb_valid &QIF_BLIMITS ) + dst->d_fieldmask |=FS_DQ_BSOFT |FS_DQ_BHARD ; +if (src->dqb_valid &QIF_SPACE ) + dst->d_fieldmask |=FS_DQ_BCOUNT ; +if (src->dqb_valid &QIF_ILIMITS ) + dst->d_fieldmask |=FS_DQ_ISOFT |FS_DQ_IHARD ; +if (src->dqb_valid &QIF_INODES ) + dst->d_fieldmask |=FS_DQ_ICOUNT ; +if (src->dqb_valid &QIF_BTIME ) + dst->d_fieldmask |=FS_DQ_BTIMER ; +if (src->dqb_valid &QIF_ITIME ) + dst->d_fieldmask |=FS_DQ_ITIMER ; +} +static int quota_setquota (struct super_block *sb,int type,qid_t id,void __user *addr) { +struct fs_disk_quota fdq;struct if_dqblk idq;if (copy_from_user (&idq, addr,sizeof (idq)))return -EFAULT ; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->set_dqblk)return -ENOSYS ; -return sb->s_qcop->set_dqblk (sb, type, id, &idq); +copy_from_if_dqblk (&fdq, &idq); +return sb->s_qcop->set_dqblk (sb, type, id, &fdq); }static int quota_setxstate (struct super_block *sb,int cmd,void __user *addr)
@@ -212,9 +238,9 @@ static int quota_setxquota(struct super_if (copy_from_user (&fdq, addr,sizeof (fdq)))return -EFAULT ; -if (!sb->s_qcop->set_xquota) +if (!sb->s_qcop->set_dqblk)return -ENOSYS ; -return sb->s_qcop->set_xquota (sb, type, id, &fdq); +return sb->s_qcop->set_dqblk (sb, type, id, &fdq); } static int quota_getxquota(struct super_block *sb, int type, qid_t id,
fs/xfs/linux-2.6/xfs_quotaops.c +2 -2
@@ -114,7 +114,7 @@ xfs_fs_get_dqblk( } STATIC int -xfs_fs_set_xquota( +xfs_fs_set_dqblk( struct super_block *sb, int type, qid_t id,
@@ -136,5 +136,5 @@ const struct quotactl_ops xfs_quotactl_o .get_xstate = xfs_fs_get_xstate, .set_xstate = xfs_fs_set_xstate, .get_dqblk = xfs_fs_get_dqblk, - .set_xquota = xfs_fs_set_xquota, + .set_dqblk = xfs_fs_set_dqblk, };
include/linux/quota.h +1 -2
@@ -312,10 +312,9 @@ struct quotactl_ops {int (*get_info)(struct super_block *,int ,struct if_dqinfo *);int (*set_info)(struct super_block *,int ,struct if_dqinfo *);int (*get_dqblk)(struct super_block *,int ,qid_t ,struct fs_disk_quota *); -int (*set_dqblk)(struct super_block *,int ,qid_t ,struct if_dqblk *); +int (*set_dqblk)(struct super_block *,int ,qid_t ,struct fs_disk_quota *);int (*get_xstate)(struct super_block *,struct fs_quota_stat *);int (*set_xstate)(struct super_block *,unsigned int ,int ); -int (*set_xquota)(struct super_block *,int ,qid_t ,struct fs_disk_quota *); };struct quota_format_type {
include/linux/quotaops.h +2 -1
@@ -65,7 +65,8 @@ int vfs_get_dqinfo(struct super_block *sint vfs_set_dqinfo (struct super_block *sb,int type,struct if_dqinfo *ii);int vfs_get_dqblk (struct super_block *sb,int type,qid_t id,struct fs_disk_quota *di); -int vfs_set_dqblk (struct super_block *sb,int type,qid_t id,struct if_dqblk *di); +int vfs_set_dqblk (struct super_block *sb,int type,qid_t id, +struct fs_disk_quota *di);int dquot_transfer (struct inode *inode,struct iattr *iattr);int vfs_dq_quota_on_remount (struct super_block *sb);
fs/xfs/quota/xfs_qm_syscalls.c +7 -3
@@ -452,6 +452,9 @@ xfs_qm_scall_getqstat(return (0 ); } +#define XFS_DQ_MASK \ + (FS_DQ_LIMIT_MASK | FS_DQ_TIMER_MASK | FS_DQ_WARNS_MASK) +/* * Adjust quota limits, and start/stop timers accordingly. */
@@ -468,9 +471,10 @@ xfs_qm_scall_setqlim(int error;xfs_qcnt_t hard, soft; -if ((newlim->d_fieldmask & - (FS_DQ_LIMIT_MASK |FS_DQ_TIMER_MASK |FS_DQ_WARNS_MASK )) ==0 ) -return (0 ); +if (newlim->d_fieldmask & ~XFS_DQ_MASK ) +return EINVAL ; +if ((newlim->d_fieldmask &XFS_DQ_MASK ) ==0 ) +return 0 ; tp =xfs_trans_alloc (mp,XFS_TRANS_QM_SETQLIM ); if ((error = xfs_trans_reserve(tp, 0, sizeof(xfs_disk_dquot_t) + 128,
include/linux/dqblk_xfs.h +9 -0
@@ -110,6 +110,15 @@ typedef struct fs_disk_quota {#define FS_DQ_WARNS_MASK (FS_DQ_BWARNS | FS_DQ_IWARNS | FS_DQ_RTBWARNS)/* +* Accounting values. These can only be set for filesystem with +* non-transactional quotas that require quotacheck(8) in userspace. +*/ +#define FS_DQ_BCOUNT (1<<12) +#define FS_DQ_ICOUNT (1<<13) +#define FS_DQ_RTBCOUNT (1<<14) +#define FS_DQ_ACCT_MASK (FS_DQ_BCOUNT | FS_DQ_ICOUNT | FS_DQ_RTBCOUNT) + +/* * Various flags related to quotactl(2). Only relevant to XFS filesystems. */ #define XFS_QUOTA_UDQ_ACCT (1<<0)/* user quota accounting */
fs/quota/dquot.c +43 -24
115 lines not on this page · raw message
[PATCH 4/3] quota: remove sb_has_quota_active in get/set_info
In reply to Christoph HellwigThe methods already do these checks, so remove them in the quotactl implementation to allow non-VFS quota implementations to also support these calls.
fs/quota/quota.c +0 -4
@@ -113,8 +113,6 @@ static int quota_getinfo(struct super_blstruct if_dqinfo info;int ret; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->get_info)return -ENOSYS ; ret = sb->s_qcop->get_info (sb, type, &info);
@@ -129,8 +127,6 @@ static int quota_setinfo(struct super_blif (copy_from_user (&info, addr,sizeof (info)))return -EFAULT ; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->set_info)return -ENOSYS ;return sb->s_qcop->set_info (sb, type, &info);
Re: [PATCH 4/3] quota: remove sb_has_quota_active in get/set_info
Quoted 3 lines · Christoph Hellwig
The methods already do these checks, so remove them in the quotactl implementation to allow non-VFS quota implementations to also support these calls.
I've merged all four patches into my tree.
Honza
Quoted 25 lines
Signed-off-by Christoph Hellwig <[email protected]>Index:
linux-2.6/fs/quota/quota.c
===================================================================fs/quota/quota.c +0
-4@@ -113,8 +113,6 @@ static int quota_getinfo(struct super_blstruct if_dqinfo info;int ret; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->get_info)return -ENOSYS ; ret = sb->s_qcop->get_info (sb, type, &info);@@ -129,8 +127,6 @@ static int quota_setinfo(struct super_blif (copy_from_user (&info, addr,sizeof (info)))return -EFAULT ; -if (!sb_has_quota_active (sb, type)) -return -ESRCH ;if (!sb->s_qcop->set_info)return -ENOSYS ;return sb->s_qcop->set_info (sb, type, &info);
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR