diff options
Diffstat (limited to 'fs/cifs/readdir.c')
-rw-r--r-- | fs/cifs/readdir.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index c08bda9fcac6..52e657ec1f18 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * fs/cifs/readdir.c | 2 | * fs/cifs/readdir.c |
3 | * | 3 | * |
4 | * Directory search handling | 4 | * Directory search handling |
5 | * | 5 | * |
6 | * Copyright (C) International Business Machines Corp., 2004, 2007 | 6 | * Copyright (C) International Business Machines Corp., 2004, 2007 |
7 | * Author(s): Steve French (sfrench@us.ibm.com) | 7 | * Author(s): Steve French (sfrench@us.ibm.com) |
8 | * | 8 | * |
@@ -34,22 +34,22 @@ | |||
34 | #ifdef CONFIG_CIFS_DEBUG2 | 34 | #ifdef CONFIG_CIFS_DEBUG2 |
35 | static void dump_cifs_file_struct(struct file *file, char *label) | 35 | static void dump_cifs_file_struct(struct file *file, char *label) |
36 | { | 36 | { |
37 | struct cifsFileInfo * cf; | 37 | struct cifsFileInfo *cf; |
38 | 38 | ||
39 | if (file) { | 39 | if (file) { |
40 | cf = file->private_data; | 40 | cf = file->private_data; |
41 | if (cf == NULL) { | 41 | if (cf == NULL) { |
42 | cFYI(1,("empty cifs private file data")); | 42 | cFYI(1, ("empty cifs private file data")); |
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | if (cf->invalidHandle) { | 45 | if (cf->invalidHandle) { |
46 | cFYI(1,("invalid handle")); | 46 | cFYI(1, ("invalid handle")); |
47 | } | 47 | } |
48 | if (cf->srch_inf.endOfSearch) { | 48 | if (cf->srch_inf.endOfSearch) { |
49 | cFYI(1,("end of search")); | 49 | cFYI(1, ("end of search")); |
50 | } | 50 | } |
51 | if (cf->srch_inf.emptyDir) { | 51 | if (cf->srch_inf.emptyDir) { |
52 | cFYI(1,("empty dir")); | 52 | cFYI(1, ("empty dir")); |
53 | } | 53 | } |
54 | 54 | ||
55 | } | 55 | } |
@@ -73,7 +73,8 @@ static int construct_dentry(struct qstr *qstring, struct file *file, | |||
73 | qstring->hash = full_name_hash(qstring->name, qstring->len); | 73 | qstring->hash = full_name_hash(qstring->name, qstring->len); |
74 | tmp_dentry = d_lookup(file->f_path.dentry, qstring); | 74 | tmp_dentry = d_lookup(file->f_path.dentry, qstring); |
75 | if (tmp_dentry) { | 75 | if (tmp_dentry) { |
76 | cFYI(0, ("existing dentry with inode 0x%p", tmp_dentry->d_inode)); | 76 | cFYI(0, ("existing dentry with inode 0x%p", |
77 | tmp_dentry->d_inode)); | ||
77 | *ptmp_inode = tmp_dentry->d_inode; | 78 | *ptmp_inode = tmp_dentry->d_inode; |
78 | /* BB overwrite old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len??*/ | 79 | /* BB overwrite old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len??*/ |
79 | if (*ptmp_inode == NULL) { | 80 | if (*ptmp_inode == NULL) { |
@@ -87,7 +88,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file, | |||
87 | } else { | 88 | } else { |
88 | tmp_dentry = d_alloc(file->f_path.dentry, qstring); | 89 | tmp_dentry = d_alloc(file->f_path.dentry, qstring); |
89 | if (tmp_dentry == NULL) { | 90 | if (tmp_dentry == NULL) { |
90 | cERROR(1,("Failed allocating dentry")); | 91 | cERROR(1, ("Failed allocating dentry")); |
91 | *ptmp_inode = NULL; | 92 | *ptmp_inode = NULL; |
92 | return rc; | 93 | return rc; |
93 | } | 94 | } |