| From b8d74eaa3aad77d93cd890a06624d9326a62d267 Mon Sep 17 00:00:00 2001 |
| From: zhengbin <zhengbin13@huawei.com> |
| Date: Thu, 21 Nov 2019 09:12:18 +0000 |
| Subject: [PATCH] afs: Remove set but not used variables 'before', 'after' |
| |
| commit 51590df4f3306cb1f43dca54e3ccdd121ab89594 upstream. |
| |
| 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 63a4681ff39c. |
| |
| Fixes: 63a4681ff39c ("afs: Locally edit directory data for mkdir/create/unlink/...") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: zhengbin <zhengbin13@huawei.com> |
| Signed-off-by: David Howells <dhowells@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c |
| index d4fbe5f85f1b..b108528bf010 100644 |
| --- a/fs/afs/dir_edit.c |
| +++ b/fs/afs/dir_edit.c |
| @@ -68,13 +68,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); |
| @@ -83,8 +81,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; |
| } |
| |
| /* |
| @@ -93,13 +89,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); |
| @@ -108,8 +102,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; |
| } |
| |
| /* |
| -- |
| 2.7.4 |
| |