diff options
author | Steve French <sfrench@us.ibm.com> | 2010-05-11 22:24:12 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-05-11 22:24:12 -0400 |
commit | aa3e5572c538d753dce11bf93532a75f95d22b40 (patch) | |
tree | 1cb58aee0cef90363cba1ca1fc3a60d97acaf379 /fs | |
parent | fdb3603800e7a65bc3cafdfd5a1797d08f09e582 (diff) |
[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.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/cifsfs.c | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 09842d3f7e1d..833166372a08 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -49,10 +49,6 @@ | |||
49 | #include "cifs_spnego.h" | 49 | #include "cifs_spnego.h" |
50 | #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ | 50 | #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ |
51 | 51 | ||
52 | #ifdef CONFIG_CIFS_QUOTA | ||
53 | static const struct quotactl_ops cifs_quotactl_ops; | ||
54 | #endif /* QUOTA */ | ||
55 | |||
56 | int cifsFYI = 0; | 52 | int cifsFYI = 0; |
57 | int cifsERROR = 1; | 53 | int cifsERROR = 1; |
58 | int traceSMB = 0; | 54 | int traceSMB = 0; |
@@ -135,9 +131,6 @@ cifs_read_super(struct super_block *sb, void *data, | |||
135 | /* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) | 131 | /* if (cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) |
136 | sb->s_blocksize = | 132 | sb->s_blocksize = |
137 | cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ | 133 | cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ |
138 | #ifdef CONFIG_CIFS_QUOTA | ||
139 | sb->s_qcop = &cifs_quotactl_ops; | ||
140 | #endif | ||
141 | sb->s_blocksize = CIFS_MAX_MSGSIZE; | 134 | sb->s_blocksize = CIFS_MAX_MSGSIZE; |
142 | sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */ | 135 | sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */ |
143 | inode = cifs_root_iget(sb, ROOT_I); | 136 | inode = cifs_root_iget(sb, ROOT_I); |
@@ -418,106 +411,6 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) | |||
418 | return 0; | 411 | return 0; |
419 | } | 412 | } |
420 | 413 | ||
421 | #ifdef CONFIG_CIFS_QUOTA | ||
422 | int cifs_xquota_set(struct super_block *sb, int quota_type, qid_t qid, | ||
423 | struct fs_disk_quota *pdquota) | ||
424 | { | ||
425 | int xid; | ||
426 | int rc = 0; | ||
427 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | ||
428 | struct cifsTconInfo *pTcon; | ||
429 | |||
430 | if (cifs_sb) | ||
431 | pTcon = cifs_sb->tcon; | ||
432 | else | ||
433 | return -EIO; | ||
434 | |||
435 | |||
436 | xid = GetXid(); | ||
437 | if (pTcon) { | ||
438 | cFYI(1, "set type: 0x%x id: %d", quota_type, qid); | ||
439 | } else | ||
440 | rc = -EIO; | ||
441 | |||
442 | FreeXid(xid); | ||
443 | return rc; | ||
444 | } | ||
445 | |||
446 | int cifs_xquota_get(struct super_block *sb, int quota_type, qid_t qid, | ||
447 | struct fs_disk_quota *pdquota) | ||
448 | { | ||
449 | int xid; | ||
450 | int rc = 0; | ||
451 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | ||
452 | struct cifsTconInfo *pTcon; | ||
453 | |||
454 | if (cifs_sb) | ||
455 | pTcon = cifs_sb->tcon; | ||
456 | else | ||
457 | return -EIO; | ||
458 | |||
459 | xid = GetXid(); | ||
460 | if (pTcon) { | ||
461 | cFYI(1, "set type: 0x%x id: %d", quota_type, qid); | ||
462 | } else | ||
463 | rc = -EIO; | ||
464 | |||
465 | FreeXid(xid); | ||
466 | return rc; | ||
467 | } | ||
468 | |||
469 | int cifs_xstate_set(struct super_block *sb, unsigned int flags, int operation) | ||
470 | { | ||
471 | int xid; | ||
472 | int rc = 0; | ||
473 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | ||
474 | struct cifsTconInfo *pTcon; | ||
475 | |||
476 | if (cifs_sb) | ||
477 | pTcon = cifs_sb->tcon; | ||
478 | else | ||
479 | return -EIO; | ||
480 | |||
481 | xid = GetXid(); | ||
482 | if (pTcon) { | ||
483 | cFYI(1, "flags: 0x%x operation: 0x%x", flags, operation); | ||
484 | } else | ||
485 | rc = -EIO; | ||
486 | |||
487 | FreeXid(xid); | ||
488 | return rc; | ||
489 | } | ||
490 | |||
491 | int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats) | ||
492 | { | ||
493 | int xid; | ||
494 | int rc = 0; | ||
495 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | ||
496 | struct cifsTconInfo *pTcon; | ||
497 | |||
498 | if (cifs_sb) | ||
499 | pTcon = cifs_sb->tcon; | ||
500 | else | ||
501 | return -EIO; | ||
502 | |||
503 | xid = GetXid(); | ||
504 | if (pTcon) { | ||
505 | cFYI(1, "pqstats %p", qstats); | ||
506 | } else | ||
507 | rc = -EIO; | ||
508 | |||
509 | FreeXid(xid); | ||
510 | return rc; | ||
511 | } | ||
512 | |||
513 | static const struct quotactl_ops cifs_quotactl_ops = { | ||
514 | .set_xquota = cifs_xquota_set, | ||
515 | .get_xquota = cifs_xquota_get, | ||
516 | .set_xstate = cifs_xstate_set, | ||
517 | .get_xstate = cifs_xstate_get, | ||
518 | }; | ||
519 | #endif | ||
520 | |||
521 | static void cifs_umount_begin(struct super_block *sb) | 414 | static void cifs_umount_begin(struct super_block *sb) |
522 | { | 415 | { |
523 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); | 416 | struct cifs_sb_info *cifs_sb = CIFS_SB(sb); |