diff mbox

[1/2] cifs: remove unneeded condition check

Message ID 001201d00884$ce584120$6b08c360$@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Namjae Jeon Nov. 25, 2014, 7:52 a.m. UTC 
file->private_data can never be null after calling initiate_cifs_search.
So private null check condition is not needed.

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
---
 fs/cifs/readdir.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Steve French Dec. 8, 2014, 5:34 a.m. UTC | #1 
merged into cifs-2.6.git

On Tue, Nov 25, 2014 at 1:52 AM, Namjae Jeon <namjae.jeon@samsung.com> wrote:
> file->private_data can never be null after calling initiate_cifs_search.
> So private null check condition is not needed.
>
> Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
> Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
> ---
>  fs/cifs/readdir.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
> index d116ca8..8eaf20a 100644
> --- a/fs/cifs/readdir.c
> +++ b/fs/cifs/readdir.c
> @@ -794,10 +794,6 @@ int cifs_readdir(struct file *file, struct dir_context *ctx)
>                 if it before then restart search
>                 if after then keep searching till find it */
>
> -       if (file->private_data == NULL) {
> -               rc = -EINVAL;
> -               goto rddir2_exit;
> -       }
>         cifsFile = file->private_data;
>         if (cifsFile->srch_inf.endOfSearch) {
>                 if (cifsFile->srch_inf.emptyDir) {
> --
> 1.7.11-rc0
>
diff mbox

Patch

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index d116ca8..8eaf20a 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -794,10 +794,6 @@  int cifs_readdir(struct file *file, struct dir_context *ctx)
 		if it before then restart search
 		if after then keep searching till find it */
 
-	if (file->private_data == NULL) {
-		rc = -EINVAL;
-		goto rddir2_exit;
-	}
 	cifsFile = file->private_data;
 	if (cifsFile->srch_inf.endOfSearch) {
 		if (cifsFile->srch_inf.emptyDir) {