Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7969315 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

nfsd: Remove macro LOFF_OVERFLOW 



Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 7a5e8d5b

fs/nfsd/nfs4state.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -5045,9 +5045,6 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

	return status;

}

}







#define LOFF_OVERFLOW(start, len)      ((u64)(len) > ~(u64)(start))



static inline u64

static inline u64

end_offset(u64 start, u64 len)

end_offset(u64 start, u64 len)

{

{
@@ -5300,7 +5297,7 @@ static int 
check_lock_length(u64 offset, u64 length)

check_lock_length(u64 offset, u64 length)

{

{

	return ((length == 0) || ((length != NFS4_MAX_UINT64) &&

	return ((length == 0) || ((length != NFS4_MAX_UINT64) &&

	     LOFF_OVERFLOW(offset, length)));

		(length > ~offset)));

}

}





static void get_lock_access(struct nfs4_ol_stateid *lock_stp, u32 access)

static void get_lock_access(struct nfs4_ol_stateid *lock_stp, u32 access)