diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-22 05:23:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-22 05:23:53 +0200 |
| commit | fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5 (patch) | |
| tree | b8c12edf3f510170cece6e9cf5337094af3095f2 /fs/cifs | |
| parent | net: Remove NET_CORE_BUDGET_USECS from sysctl binary interface. (diff) | |
| parent | Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.tar.xz linux-fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Both conflict were simple overlapping changes.
In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/smb1ops.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index cc93ba4da9b5..27bc360c7ffd 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c @@ -1015,6 +1015,15 @@ cifs_dir_needs_close(struct cifsFileInfo *cfile) return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle; } +static bool +cifs_can_echo(struct TCP_Server_Info *server) +{ + if (server->tcpStatus == CifsGood) + return true; + + return false; +} + struct smb_version_operations smb1_operations = { .send_cancel = send_nt_cancel, .compare_fids = cifs_compare_fids, @@ -1049,6 +1058,7 @@ struct smb_version_operations smb1_operations = { .get_dfs_refer = CIFSGetDFSRefer, .qfs_tcon = cifs_qfs_tcon, .is_path_accessible = cifs_is_path_accessible, + .can_echo = cifs_can_echo, .query_path_info = cifs_query_path_info, .query_file_info = cifs_query_file_info, .get_srv_inum = cifs_get_srv_inum, |