Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocfs2: Move 'wanted' into parens of ocfs2_resmap_resv_bits.

Browse source 
The first time I read the function ocfs2_resmap_resv_bits, I consider
about what 'wanted' will be used and consider about the comments.
Then I find it is only used if the reservation is empty. ;)

So we'd better move it to the parens so that it make the code more
readable, what's more, ocfs2_resmap_resv_bits is used so frequently
and we should save some cpus.

Acked-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
This commit is contained in:
Tao Ma 2010-09-19 13:42:28 +08:00 committed by Joel Becker
parent 47dea42379
commit 4a452de4fd
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs/ocfs2/reservations.c
View file

@ -732,25 +732,23 @@ int ocfs2_resmap_resv_bits(struct ocfs2_reservation_map *resmap,
struct ocfs2_alloc_reservation *resv, struct ocfs2_alloc_reservation *resv,
int *cstart, int *clen) int *cstart, int *clen)
{ {
unsigned int wanted = *clen;
if (resv == NULL || ocfs2_resmap_disabled(resmap)) if (resv == NULL || ocfs2_resmap_disabled(resmap))
return -ENOSPC; return -ENOSPC;
spin_lock(&resv_lock); spin_lock(&resv_lock);
/*
* We don't want to over-allocate for temporary
* windows. Otherwise, we run the risk of fragmenting the
* allocation space.
*/
wanted = ocfs2_resv_window_bits(resmap, resv);
if ((resv->r_flags & OCFS2_RESV_FLAG_TMP) || wanted < *clen)
wanted = *clen;
if (ocfs2_resv_empty(resv)) { if (ocfs2_resv_empty(resv)) {
mlog(0, "empty reservation, find new window\n"); /*
* We don't want to over-allocate for temporary
* windows. Otherwise, we run the risk of fragmenting the
* allocation space.
*/
unsigned int wanted = ocfs2_resv_window_bits(resmap, resv);
if ((resv->r_flags & OCFS2_RESV_FLAG_TMP) || wanted < *clen)
wanted = *clen;
mlog(0, "empty reservation, find new window\n");
/* /*
* Try to get a window here. If it works, we must fall * Try to get a window here. If it works, we must fall
* through and test the bitmap . This avoids some * through and test the bitmap . This avoids some