forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: lustre: fix TRAILING_STATEMENTS checkpatch errors

Browse source 
Move trailing statements to be on the next line to fix the
TRAILING_STATEMENTS checkpatch error.

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2015-09-12 19:20:03 +03:00 • committed by Greg Kroah-Hartman
commit 910b551c85
6 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/lustre/lustre/include/obd_support.h
View file

@ -655,8 +655,10 @@ do { \
#endif
#ifdef POISON_BULK
#define POISON_PAGE(page, val) do { memset(kmap(page), val, PAGE_CACHE_SIZE); \
kunmap(page); } while (0)
#define POISON_PAGE(page, val) do { \
memset(kmap(page), val, PAGE_CACHE_SIZE); \
kunmap(page); \
} while (0)
#else
#define POISON_PAGE(page, val) do { } while (0)
#endif

3
drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
View file

@ -699,7 +699,8 @@ cfs_cpt_num_estimate(void)
/* generate reasonable number of CPU partitions based on total number
* of CPUs, Preferred N should be power2 and match this condition:
* 2 * (N - 1)^2 < NCPUS <= 2 * N^2 */
for (ncpt = 2; ncpu > 2 * ncpt * ncpt; ncpt <<= 1) {}
for (ncpt = 2; ncpu > 2 * ncpt * ncpt; ncpt <<= 1)
;
if (ncpt <= nnode) { /* fat numa system */
while (nnode > ncpt)

3
drivers/staging/lustre/lustre/llite/lproc_llite.c
View file

@ -1326,7 +1326,8 @@ void ll_rw_stats_tally(struct ll_sb_info *sbi, pid_t pid,
}
for (i = 0; (count >= (1 << LL_HIST_START << i)) &&
(i < (LL_HIST_MAX - 1)); i++);
(i < (LL_HIST_MAX - 1)); i++)
;
if (rw == 0) {
io_extents->pp_extents[cur].pp_r_hist.oh_buckets[i]++;
io_extents->pp_extents[LL_PROCESS_HIST_MAX].pp_r_hist.oh_buckets[i]++;

3
drivers/staging/lustre/lustre/lmv/lmv_obd.c
View file

@ -2099,7 +2099,8 @@ static void lmv_adjust_dirpages(struct page **pages, int ncfspgs, int nlupgs)
while (--nlupgs > 0) {
ent = lu_dirent_start(dp);
for (end_dirent = ent; ent != NULL;
end_dirent = ent, ent = lu_dirent_next(ent));
end_dirent = ent, ent = lu_dirent_next(ent))
;
/* Advance dp to next lu_dirpage. */
dp = (struct lu_dirpage *)((char *)dp + LU_PAGE_SIZE);

6
drivers/staging/lustre/lustre/obdclass/obd_mount.c
View file

@ -929,7 +929,8 @@ static int lmd_parse_mgs(struct lustre_mount_data *lmd, char **ptr)
int oldlen = 0;
/* Find end of nidlist */
while (class_parse_nid_quiet(tail, &nid, &tail) == 0) {}
while (class_parse_nid_quiet(tail, &nid, &tail) == 0)
;
length = tail - *ptr;
if (length == 0) {
LCONSOLE_ERROR_MSG(0x159, "Can't parse NID '%s'\n", *ptr);
@ -1117,7 +1118,8 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
++s1;
lmd->lmd_flags |= LMD_FLG_CLIENT;
/* Remove leading /s from fsname */
while (*++s1 == '/') ;
while (*++s1 == '/')
;
/* Freed in lustre_free_lsi */
lmd->lmd_profile = kasprintf(GFP_NOFS, "%s-client", s1);
if (!lmd->lmd_profile)

3
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
View file

@ -143,7 +143,8 @@ cleanup:
ptlrpc_hr_fini();
req_layout_fini();
/* Fall through */
default: ;
default:
;
}
return rc;