Skip to content

Commit

Permalink
NFS: Remove no-op less-than-zero checks on unsigned variables.
Browse files Browse the repository at this point in the history
Introduced by commit 16b374c "NFSv4.1: pnfs: filelayout: add driver's
LAYOUTGET and GETDEVICEINFO infrastructure" (October 20, 2010).

Signed-off-by: Chuck Lever <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
  • Loading branch information
chucklever authored and Trond Myklebust committed Oct 31, 2011
1 parent c6e6966 commit e414966
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions fs/nfs/nfs4filelayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,8 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,

fl->dsaddr = dsaddr;

if (fl->first_stripe_index < 0 ||
fl->first_stripe_index >= dsaddr->stripe_count) {
dprintk("%s Bad first_stripe_index %d\n",
if (fl->first_stripe_index >= dsaddr->stripe_count) {
dprintk("%s Bad first_stripe_index %u\n",
__func__, fl->first_stripe_index);
goto out_put;
}
Expand Down Expand Up @@ -552,7 +551,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo,

/* Note that a zero value for num_fh is legal for STRIPE_SPARSE.
* Futher checking is done in filelayout_check_layout */
if (fl->num_fh < 0 || fl->num_fh >
if (fl->num_fh >
max(NFS4_PNFS_MAX_STRIPE_CNT, NFS4_PNFS_MAX_MULTI_CNT))
goto out_err;

Expand Down

0 comments on commit e414966

Please sign in to comment.