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

Commit 3c4ee9a1 authored by zhengbin's avatar zhengbin Committed by Greg Kroah-Hartman
Browse files

afs: Remove set but not used variables 'before', 'after' 



[ Upstream commit 51590df4f3306cb1f43dca54e3ccdd121ab89594 ]

Fixes gcc '-Wunused-but-set-variable' warning:

fs/afs/dir_edit.c: In function afs_set_contig_bits:
fs/afs/dir_edit.c:75:20: warning: variable after set but not used [-Wunused-but-set-variable]
fs/afs/dir_edit.c: In function afs_set_contig_bits:
fs/afs/dir_edit.c:75:12: warning: variable before set but not used [-Wunused-but-set-variable]
fs/afs/dir_edit.c: In function afs_clear_contig_bits:
fs/afs/dir_edit.c:100:20: warning: variable after set but not used [-Wunused-but-set-variable]
fs/afs/dir_edit.c: In function afs_clear_contig_bits:
fs/afs/dir_edit.c:100:12: warning: variable before set but not used [-Wunused-but-set-variable]

They are never used since commit 63a4681f.

Fixes: 63a4681f ("afs: Locally edit directory data for mkdir/create/unlink/...")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarzhengbin <zhengbin13@huawei.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c96c5435

fs/afs/dir_edit.c

+2 −10
Original line number Diff line number Diff line
@@ -72,13 +72,11 @@ static int afs_find_contig_bits(union afs_xdr_dir_block *block, unsigned int nr_ 
static void afs_set_contig_bits(union afs_xdr_dir_block *block,

				int bit, unsigned int nr_slots)

{

	u64 mask, before, after;

	u64 mask;



	mask = (1 << nr_slots) - 1;

	mask <<= bit;



	before = *(u64 *)block->hdr.bitmap;



	block->hdr.bitmap[0] |= (u8)(mask >> 0 * 8);

	block->hdr.bitmap[1] |= (u8)(mask >> 1 * 8);

	block->hdr.bitmap[2] |= (u8)(mask >> 2 * 8);
@@ -87,8 +85,6 @@ static void afs_set_contig_bits(union afs_xdr_dir_block *block, 
	block->hdr.bitmap[5] |= (u8)(mask >> 5 * 8);

	block->hdr.bitmap[6] |= (u8)(mask >> 6 * 8);

	block->hdr.bitmap[7] |= (u8)(mask >> 7 * 8);



	after = *(u64 *)block->hdr.bitmap;

}



/*
@@ -97,13 +93,11 @@ static void afs_set_contig_bits(union afs_xdr_dir_block *block, 
static void afs_clear_contig_bits(union afs_xdr_dir_block *block,

				  int bit, unsigned int nr_slots)

{

	u64 mask, before, after;

	u64 mask;



	mask = (1 << nr_slots) - 1;

	mask <<= bit;



	before = *(u64 *)block->hdr.bitmap;



	block->hdr.bitmap[0] &= ~(u8)(mask >> 0 * 8);

	block->hdr.bitmap[1] &= ~(u8)(mask >> 1 * 8);

	block->hdr.bitmap[2] &= ~(u8)(mask >> 2 * 8);
@@ -112,8 +106,6 @@ static void afs_clear_contig_bits(union afs_xdr_dir_block *block, 
	block->hdr.bitmap[5] &= ~(u8)(mask >> 5 * 8);

	block->hdr.bitmap[6] &= ~(u8)(mask >> 6 * 8);

	block->hdr.bitmap[7] &= ~(u8)(mask >> 7 * 8);



	after = *(u64 *)block->hdr.bitmap;

}



/*