[PATCH] remove redundant check for cifs file data

Shirish Pargaonkar shirishpargaonkar at gmail.com
Wed Mar 10 11:24:18 MST 2010


---
 fs/cifs/readdir.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index c343b14..e8a7794 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -812,11 +812,7 @@ int cifs_readdir(struct file *file, void
*direntry, filldir_t filldir)
 				return rc;
 			}
 		}
-		if (file->private_data =3D=3D NULL) {
-			rc =3D -EINVAL;
-			FreeXid(xid);
-			return rc;
-		}
+
 		cifsFile =3D file->private_data;
 		if (cifsFile->srch_inf.endOfSearch) {
 			if (cifsFile->srch_inf.emptyDir) {
--=20
1.6.0.2

--00c09f971e7e1c8e6e048176c1dc
Content-Type: application/octet-stream; name="readdir-cleanup.patch"
Content-Disposition: attachment; filename="readdir-cleanup.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g6mh2oxv0

RnJvbSBjMTk0NWFhNDY5ODcyNWY4ZjY5YzNlNDAyZmVlNzA2MjQ2ODA3NWMzIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBTaGlyaXNoIFBhcmdhb25rYXIgPHNoaXJpc2hwYXJnYW9ua2Fy
QGdtYWlsLmNvbT4KRGF0ZTogV2VkLCAxMCBNYXIgMjAxMCAxMjoyNDoxOCAtMDYwMApTdWJqZWN0
OiBbUEFUQ0hdIHJlbW92ZSByZWR1bmRhbnQgY2hlY2sgZm9yIGNpZnMgZmlsZSBkYXRhCgotLS0K
IGZzL2NpZnMvcmVhZGRpci5jIHwgICAgNiArLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMSBpbnNl
cnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2ZzL2NpZnMvcmVhZGRpci5j
IGIvZnMvY2lmcy9yZWFkZGlyLmMKaW5kZXggYzM0M2IxNC4uZThhNzc5NCAxMDA2NDQKLS0tIGEv
ZnMvY2lmcy9yZWFkZGlyLmMKKysrIGIvZnMvY2lmcy9yZWFkZGlyLmMKQEAgLTgxMiwxMSArODEy
LDcgQEAgaW50IGNpZnNfcmVhZGRpcihzdHJ1Y3QgZmlsZSAqZmlsZSwgdm9pZCAqZGlyZW50cnks
IGZpbGxkaXJfdCBmaWxsZGlyKQogCQkJCXJldHVybiByYzsKIAkJCX0KIAkJfQotCQlpZiAoZmls
ZS0+cHJpdmF0ZV9kYXRhID09IE5VTEwpIHsKLQkJCXJjID0gLUVJTlZBTDsKLQkJCUZyZWVYaWQo
eGlkKTsKLQkJCXJldHVybiByYzsKLQkJfQorCiAJCWNpZnNGaWxlID0gZmlsZS0+cHJpdmF0ZV9k
YXRhOwogCQlpZiAoY2lmc0ZpbGUtPnNyY2hfaW5mLmVuZE9mU2VhcmNoKSB7CiAJCQlpZiAoY2lm
c0ZpbGUtPnNyY2hfaW5mLmVtcHR5RGlyKSB7Ci0tIAoxLjYuMC4yCgo=
--00c09f971e7e1c8e6e048176c1dc--


More information about the linux-cifs-client mailing list