[linux-cifs-client] [PATCH 1/3] cifs: drop quota operation stubs

[Jan Kara]

On Wed 05-05-10 06:39:38, Christoph Hellwig 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.
  I have no problem with this but maybe a word from CIFS guys would be
nice? Added to CC...

								Honza
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> 
> Index: linux-2.6/fs/cifs/cifsfs.c
> ===================================================================
> --- linux-2.6.orig/fs/cifs/cifsfs.c	2010-04-28 13:48:24.783253716 +0200
> +++ linux-2.6/fs/cifs/cifsfs.c	2010-04-28 13:49:23.706253646 +0200
> @@ -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, st
>  	return 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 <jack at suse.cz>
SUSE Labs, CR