diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-04 12:22:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-04 12:22:54 -0400 |
| commit | a6cbfa1e6d38c4b3ab0ce7e3aea4bb4e744f24b8 (patch) | |
| tree | 8960e571a398b5d32e72bdb9c89ce965daa870ab /fs/cifs/smb1ops.c | |
| parent | f5308d1b83eba20e69df5e0926ba7257c8dd9074 (diff) | |
| parent | 08d6ac9ee5fedd82040bc878705981b67a116a3f (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.14 merge window.
Diffstat (limited to 'fs/cifs/smb1ops.c')
| -rw-r--r-- | fs/cifs/smb1ops.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index 27bc360c7ffd..a723df3e0197 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c | |||
| @@ -849,8 +849,13 @@ cifs_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, | |||
| 849 | struct cifs_fid *fid, __u16 search_flags, | 849 | struct cifs_fid *fid, __u16 search_flags, |
| 850 | struct cifs_search_info *srch_inf) | 850 | struct cifs_search_info *srch_inf) |
| 851 | { | 851 | { |
| 852 | return CIFSFindFirst(xid, tcon, path, cifs_sb, | 852 | int rc; |
| 853 | &fid->netfid, search_flags, srch_inf, true); | 853 | |
| 854 | rc = CIFSFindFirst(xid, tcon, path, cifs_sb, | ||
| 855 | &fid->netfid, search_flags, srch_inf, true); | ||
| 856 | if (rc) | ||
| 857 | cifs_dbg(FYI, "find first failed=%d\n", rc); | ||
| 858 | return rc; | ||
| 854 | } | 859 | } |
| 855 | 860 | ||
| 856 | static int | 861 | static int |
