| Message ID | 20241007152334.11780-1-advaitdhamorikar@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] smb/client: Fix logically dead code | expand |
Merged into cifs-2.6.git for-next (also FYI - a similar patch was submitted soon after this one by Colin, but was duplicate) On Mon, Oct 7, 2024 at 10:23 AM Advait Dhamorikar <advaitdhamorikar@gmail.com> wrote: > > The if condition in collect_sample: can never be satisfied > because of a logical contradiction. The indicated dead code > may have performed some action; that action will never occur. > > Fixes: 94ae8c3fee94 ("smb: client: compress: LZ77 code improvements cleanup") > Signed-off-by: Advait Dhamorikar <advaitdhamorikar@gmail.com> > --- > v1->v2: update short log and changelog > > fs/smb/client/compress.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/fs/smb/client/compress.c b/fs/smb/client/compress.c > index 63b5a55b7a57..766b4de13da7 100644 > --- a/fs/smb/client/compress.c > +++ b/fs/smb/client/compress.c > @@ -166,7 +166,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample) > loff_t start = iter->xarray_start + iter->iov_offset; > pgoff_t last, index = start / PAGE_SIZE; > size_t len, off, foff; > - ssize_t ret = 0; > void *p; > int s = 0; > > @@ -193,9 +192,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample) > memcpy(&sample[s], p, len2); > kunmap_local(p); > > - if (ret < 0) > - return ret; > - > s += len2; > > if (len2 < SZ_2K || s >= max - SZ_2K) > -- > 2.34.1 >
diff --git a/fs/smb/client/compress.c b/fs/smb/client/compress.c index 63b5a55b7a57..766b4de13da7 100644 --- a/fs/smb/client/compress.c +++ b/fs/smb/client/compress.c @@ -166,7 +166,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample) loff_t start = iter->xarray_start + iter->iov_offset; pgoff_t last, index = start / PAGE_SIZE; size_t len, off, foff; - ssize_t ret = 0; void *p; int s = 0; @@ -193,9 +192,6 @@ static int collect_sample(const struct iov_iter *iter, ssize_t max, u8 *sample) memcpy(&sample[s], p, len2); kunmap_local(p); - if (ret < 0) - return ret; - s += len2; if (len2 < SZ_2K || s >= max - SZ_2K)
The if condition in collect_sample: can never be satisfied because of a logical contradiction. The indicated dead code may have performed some action; that action will never occur. Fixes: 94ae8c3fee94 ("smb: client: compress: LZ77 code improvements cleanup") Signed-off-by: Advait Dhamorikar <advaitdhamorikar@gmail.com> --- v1->v2: update short log and changelog fs/smb/client/compress.c | 4 ---- 1 file changed, 4 deletions(-)