diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 11:11:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 11:11:28 -0700 |
| commit | 1d87c28e680ce4ecb8c260d8ce070b8339d52abb (patch) | |
| tree | 84d145886c982d1193418bb9e43de774beb21d3b /fs/cifs/dir.c | |
| parent | aebdd82e18c38258fe84ea080a43c098e826ef63 (diff) | |
| parent | 14cae3243b555afda69a57778069ddca65532c06 (diff) | |
| download | linux-1d87c28e680ce4ecb8c260d8ce070b8339d52abb.tar.gz linux-1d87c28e680ce4ecb8c260d8ce070b8339d52abb.tar.bz2 linux-1d87c28e680ce4ecb8c260d8ce070b8339d52abb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: Cleanup: check return codes of crypto api calls
CIFS: Fix oops while mounting with prefixpath
[CIFS] Redundant null check after dereference
cifs: use cifs_dirent in cifs_save_resume_key
cifs: use cifs_dirent to replace cifs_get_name_from_search_buf
cifs: introduce cifs_dirent
cifs: cleanup cifs_filldir
Diffstat (limited to 'fs/cifs/dir.c')
| -rw-r--r-- | fs/cifs/dir.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 499f27fc8576..ae576fbb5142 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -57,11 +57,6 @@ build_path_from_dentry(struct dentry *direntry) struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb); unsigned seq; - 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 */ - dirsep = CIFS_DIR_SEP(cifs_sb); if (tcon->Flags & SMB_SHARE_IS_IN_DFS) dfsplen = strnlen(tcon->treeName, MAX_TREE_SIZE + 1); |