staging/lustre: Remove duplicated quota defines

QUOTABLOCK_BITS, QUOTABLOCK_SIZE and toqb are only used on the server
and are copied from kernel code anyway.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 26f1c43e15b951ffca394e832af616ac9c6ba04d..ccb1b85c835fde6c4a4811a3289f9ca2cea6e0a7 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -1778,18 +1778,6 @@ void lustre_swab_ost_lvb(struct ost_lvb *lvb);
  *   lquota data structures
  */
 
-#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
-
 /* The lquota_id structure is an union of all the possible identifier types that
  * can be used with quota, this includes:
  * - 64-bit user ID

diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
index 3f9acc20a80dba31ccf4629daba6871d7644c4d0..799a85ace588ee07d378fe74f889a64804c61f65 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
@@ -1507,11 +1507,6 @@ void lustre_assert_wire_constants(void)
        LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
                 (long long)(int)sizeof(union lquota_id));
 
-       LASSERTF(QUOTABLOCK_BITS == 10, "found %lld\n",
-                (long long)QUOTABLOCK_BITS);
-       LASSERTF(QUOTABLOCK_SIZE == 1024, "found %lld\n",
-                (long long)QUOTABLOCK_SIZE);
-
        /* Checks for struct obd_quotactl */
        LASSERTF((int)sizeof(struct obd_quotactl) == 112, "found %lld\n",
                 (long long)(int)sizeof(struct obd_quotactl));