From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH v2 30/84] staging/lustre: Remove duplicated quota defines
Date: Wed, 24 Feb 2016 22:00:13 -0500 [thread overview]
Message-ID: <1456369267-904461-31-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1456369267-904461-1-git-send-email-green@linuxhacker.ru>
From: Oleg Drokin <green@linuxhacker.ru>
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>
---
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 12 ------------
drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 5 -----
2 files changed, 17 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 26f1c43..ccb1b85 100644
--- 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 3f9acc2..799a85ac 100644
--- 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));
--
2.1.0
next prev parent reply other threads:[~2016-02-25 3:02 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 2:59 [PATCH v2 00/84] Lustre cleanups green
2016-02-25 2:59 ` [PATCH v2 01/84] staging/lustre/ldlm: Remove unused lr_most_restr from struct ldlm_resource green
2016-02-25 2:59 ` [PATCH v2 02/84] staging/lustre/fld: Remove useless typedefs green
2016-02-25 2:59 ` [PATCH v2 03/84] staging/lustre: Get rid of client_obd_lock_t typedef green
2016-02-25 2:59 ` [PATCH v2 04/84] staging/lustre: Get rid of loc_flags_t typedef green
2016-02-25 2:59 ` [PATCH v2 05/84] staging/lustre: Get rid of cksum_type_t typedef green
2016-02-25 2:59 ` [PATCH v2 06/84] staging/lustre: Get rid of ost_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 07/84] staging/lustre: Get rid of quota_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 08/84] staging/lustre: Get rid of mds_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 09/84] staging/lustre: Get rid of mds_reint_t, mdt_reint_t typedefs green
2016-02-25 2:59 ` [PATCH v2 10/84] staging/lustre: Get rid of ldlm_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 11/84] staging/lustre: Remove ldlm type/mode typedefs green
2016-02-25 2:59 ` [PATCH v2 12/84] staging/lustre: Get rid of mgs_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 13/84] staging/lustre: Get rid of obd_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 14/84] staging/lustre: Get rid of llog_op_type typedef green
2016-02-25 2:59 ` [PATCH v2 15/84] staging/lustre: Get rid of sec_cmd_t typedef green
2016-02-25 2:59 ` [PATCH v2 16/84] staging/lustre: Get rid of object update code green
2016-02-25 3:00 ` [PATCH v2 17/84] staging/lustre: Get rid of lustre_fid typedef green
2016-02-25 3:00 ` [PATCH v2 18/84] staging/lustre: Get rid of lustre_quota_version typedef green
2016-02-25 3:00 ` [PATCH v2 19/84] staging/lustre: Get rid of ldlm_error_t typedef green
2016-02-25 3:00 ` [PATCH v2 20/84] staging/lustre: Remove ldlm_appetite_t typedef green
2016-02-25 3:00 ` [PATCH v2 21/84] staging/lustre: Get rid of ldlm_ns_type_t typedef green
2016-02-25 3:00 ` [PATCH v2 22/84] staging/lustre: Get rid of ldlm_cancel_flags_t typedef green
2016-02-25 3:00 ` [PATCH v2 23/84] staging/lustre/llite: Get rid of se_stat_t typedef green
2016-02-25 3:00 ` [PATCH v2 24/84] staging/lustre: Remove lustre_build_version.h green
2016-02-25 3:00 ` [PATCH v2 25/84] staging/lustre: Get rid of C99 comments in lustre_idl.h green
2016-02-25 3:00 ` [PATCH v2 26/84] staging/lustre: Remove server-side changelog defines green
2016-02-25 3:00 ` [PATCH v2 27/84] staging/lustre: Remove FSF mailing address from GPL notices green
2016-02-25 3:00 ` [PATCH v2 28/84] staging/lustre: Remove server-only values from enum lu_dirent_attrs green
2016-02-25 3:00 ` [PATCH v2 29/84] staging/lustre: Remove *_CONNECT_SUPPORTED defines green
2016-02-25 3:00 ` green [this message]
2016-02-25 3:00 ` [PATCH v2 31/84] staging/lustre: Remove unused struct quota_body green
2016-02-25 3:00 ` [PATCH v2 32/84] staging/lustre: Remove lquota_glb_rec, lquota_slv_rec and lquota_acct_rec green
2016-02-25 3:00 ` [PATCH v2 33/84] staging/lustre: S_DIRSYNC is always defined in kernel green
2016-02-25 3:00 ` [PATCH v2 34/84] staging/lustre: FMODE_READ and FMODE_WRITE are always defined in the kernel green
2016-02-25 3:00 ` [PATCH v2 35/84] staging/lustre: Remove index file transfer structures green
2016-02-25 3:00 ` [PATCH v2 36/84] staging/lustre: Remove server data from struct obd_export green
2016-02-25 3:00 ` [PATCH v2 37/84] staging/lustre: Remove last_rcvd-file related data green
2016-02-25 3:00 ` [PATCH v2 38/84] staging/lustre: Remove dead code in ldlm_lock_destroy_internal green
2016-02-25 3:00 ` [PATCH v2 39/84] staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it green
2016-02-25 3:00 ` [PATCH v2 40/84] staging/lustre: Remove unused lli_open_count from struct ll_inode_info green
2016-02-25 3:00 ` [PATCH v2 41/84] staging/lustre: Reformat comments and structures in lustre_idl.h green
2016-02-25 3:00 ` [PATCH v2 42/84] staging/lustre/include: Adjust comment style green
2016-02-25 3:00 ` [PATCH v2 43/84] staging/lustre/fld: Adjust comments to better conform to coding style green
2016-02-25 3:00 ` [PATCH v2 44/84] staging/lustre/fid: " green
2016-02-25 3:00 ` [PATCH v2 45/84] staging/lustre/lclient: " green
2016-02-25 3:00 ` [PATCH v2 46/84] staging/lustre/ldlm: " green
2016-02-25 3:00 ` [PATCH v2 47/84] staging/lustre/llite: " green
2016-02-25 3:00 ` [PATCH v2 48/84] staging/lustre/lmv: " green
2016-02-25 3:00 ` [PATCH v2 49/84] staging/lustre/lov: " green
2016-02-25 3:00 ` [PATCH v2 50/84] staging/lustre/mdc: " green
2016-02-25 3:00 ` [PATCH v2 51/84] staging/lustre/mgc: " green
2016-02-25 3:00 ` [PATCH v2 52/84] staging/lustre/obdclass: " green
2016-02-25 3:00 ` [PATCH v2 53/84] staging/lustre/obdecho: " green
2016-02-25 3:00 ` [PATCH v2 54/84] staging/lustre/osc: " green
2016-02-25 3:00 ` [PATCH v2 55/84] staging/lustre/ptlrpc: " green
2016-02-25 3:00 ` [PATCH v2 56/84] staging/lustre: Fix indentation mistakes green
2016-02-25 3:00 ` [PATCH v2 57/84] staging/lustre: Remove stray space before newline in messages green
2016-02-25 3:00 ` [PATCH v2 58/84] staging/lustre: Remove commented out obd functions green
2016-02-25 3:00 ` [PATCH v2 59/84] staging/lustre: Remove unused members of struct ll_sb_info green
2016-02-25 3:00 ` [PATCH v2 60/84] staging/lustre/llite: Fix style vs open parenthesis alignment green
2016-02-26 6:10 ` Greg Kroah-Hartman
2016-02-26 6:13 ` Oleg Drokin
2016-02-25 3:00 ` [PATCH v2 61/84] staging/lustre/include: Fix style of function declarations green
2016-02-25 3:00 ` [PATCH v2 62/84] staging/lustre/fld: Fix style vs open parenthesis alignment green
2016-02-25 3:00 ` [PATCH v2 63/84] staging/lustre: Remove unused liblustre_check_services prototype green
2016-02-25 3:00 ` [PATCH v2 64/84] staging/lustre: Remove unused lustre_build_lock_params() green
2016-02-25 3:00 ` [PATCH v2 65/84] staging/lustre: Convert ptlrpc_at_check_timed to void green
2016-02-25 3:00 ` [PATCH v2 66/84] staging/lustre: Remove misleading liblustre comments green
2016-02-25 3:00 ` [PATCH v2 67/84] staging/lustre: Remove liblustre references from explanations green
2016-02-25 3:00 ` [PATCH v2 68/84] staging/lustre/lmv: Remove commented out MDS selection policies green
2016-02-25 3:00 ` [PATCH v2 69/84] staging/lustre: F_SETLKW64 F_SETLK64 F_GETLK64 are always defined green
2016-02-25 3:00 ` [PATCH v2 70/84] staging/lustre: MS_POSIXACL is always defined, don't check for it green
2016-02-25 3:00 ` [PATCH v2 71/84] staging/lustre: Remove RELEASEPAGE_ARG_TYPE compat macro green
2016-02-25 3:00 ` [PATCH v2 72/84] staging/lustre: NEED_QUOTA_DEFS is never defined, drop it green
2016-02-25 3:00 ` [PATCH v2 73/84] staging/lustre/ptlrpc: Fix style vs open parenthesis alignment green
2016-02-25 3:00 ` [PATCH v2 74/84] staging/lustre/osc: " green
2016-02-25 3:00 ` [PATCH v2 75/84] staging/lustre/obdclass: " green
2016-02-25 3:00 ` [PATCH v2 76/84] staging/lustre/lov: " green
2016-02-25 3:01 ` [PATCH v2 77/84] staging/lustre/mdc: " green
2016-02-25 3:01 ` [PATCH v2 78/84] staging/lustre/mgc: " green
2016-02-25 3:01 ` [PATCH v2 79/84] staging/lustre/obdecho: " green
2016-02-25 3:01 ` [PATCH v2 80/84] staging/lustre/lmv: " green
2016-02-25 3:01 ` [PATCH v2 81/84] staging/lustre: Fix lines that start with spaces green
2016-02-25 3:01 ` [PATCH v2 82/84] staging/lustre: Rework MAX_DIO_SIZE macro green
2016-02-25 3:01 ` [PATCH v2 83/84] staging/lustre: Remove unneeded {} in lprocfs_stats_unlock() green
2016-02-25 3:01 ` [PATCH v2 84/84] staging/lustre/ptlrpc: Fix ENABLE_PINGER ifdef green
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456369267-904461-31-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome