cifs: cleanup - check for null direntry first

Commit Message

Shirish Pargaonkar July 12, 2011, 3:02 p.m. UTC

From: Shirish Pargaonkar <[e-mail]>


Check for NULL direntry before assigning fields off of it.


Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail>
---
 fs/cifs/dir.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 81914df..e9ea4c8 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -53,14 +53,16 @@  build_path_from_dentry(struct dentry *direntry)
 	int dfsplen;
 	char *full_path;
 	char dirsep;
-	struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);
-	struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
+	struct cifs_sb_info *cifs_sb;
+	struct cifs_tcon *tcon;
 
 	if (direntry == NULL)
 		return NULL;  /* not much we can do if dentry is freed and
 		we need to reopen the file after it was closed implicitly
 		when the server crashed */
 
+	cifs_sb = CIFS_SB(direntry->d_sb);
+	tcon = cifs_sb_master_tcon(cifs_sb);
 	dirsep = CIFS_DIR_SEP(cifs_sb);
 	if (tcon->Flags & SMB_SHARE_IS_IN_DFS)
 		dfsplen = strnlen(tcon->treeName, MAX_TREE_SIZE + 1);