diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-07-14 22:37:11 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-08-11 21:27:07 +0000 |
| commit | 3a5ff61c18659443f76bad6cf06f60103046de5d (patch) | |
| tree | 541e341724b50b11c598c9790370d460f189586b /fs/cifs/connect.c | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
| download | linux-3a5ff61c18659443f76bad6cf06f60103046de5d.tar.gz linux-3a5ff61c18659443f76bad6cf06f60103046de5d.tar.bz2 linux-3a5ff61c18659443f76bad6cf06f60103046de5d.zip | |
[CIFS] Do not time out posix brl requests when using new posix setfileinfo
request and do not time out slow requests to a server that is still responding
well to other threads
Suggested by jra of Samba team
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 89b57148115479eef074b8d3f86c4c86c96ac969 commit)
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 876eb9ef85fe..c4aedcf5c924 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -612,6 +612,10 @@ multi_t2_fnd: #ifdef CONFIG_CIFS_STATS2 mid_entry->when_received = jiffies; #endif + /* so we do not time out requests to server + which is still responding (since server could + be busy but not dead) */ + server->lstrp = jiffies; break; } } @@ -1969,7 +1973,18 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, } cFYI(1,("Negotiate caps 0x%x",(int)cap)); - +#ifdef CONFIG_CIFS_DEBUG2 + if(cap & CIFS_UNIX_FCNTL_CAP) + cFYI(1,("FCNTL cap")); + if(cap & CIFS_UNIX_EXTATTR_CAP) + cFYI(1,("EXTATTR cap")); + if(cap & CIFS_UNIX_POSIX_PATHNAMES_CAP) + cFYI(1,("POSIX path cap")); + if(cap & CIFS_UNIX_XATTR_CAP) + cFYI(1,("XATTR cap")); + if(cap & CIFS_UNIX_POSIX_ACL_CAP) + cFYI(1,("POSIX ACL cap")); +#endif /* CIFS_DEBUG2 */ if (CIFSSMBSetFSUnixInfo(xid, tcon, cap)) { cFYI(1,("setting capabilities failed")); } |