aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-07-14 18:37:11 -0400
committerSteve French <sfrench@us.ibm.com>2006-08-11 17:27:07 -0400
commit3a5ff61c18659443f76bad6cf06f60103046de5d (patch)
tree541e341724b50b11c598c9790370d460f189586b /fs/cifs/connect.c
parent9f737633e6ee54fc174282d49b2559bd2208391d (diff)
[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.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 876eb9ef85f..c4aedcf5c92 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -612,6 +612,10 @@ multi_t2_fnd:
612#ifdef CONFIG_CIFS_STATS2 612#ifdef CONFIG_CIFS_STATS2
613 mid_entry->when_received = jiffies; 613 mid_entry->when_received = jiffies;
614#endif 614#endif
615 /* so we do not time out requests to server
616 which is still responding (since server could
617 be busy but not dead) */
618 server->lstrp = jiffies;
615 break; 619 break;
616 } 620 }
617 } 621 }
@@ -1969,7 +1973,18 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
1969 } 1973 }
1970 1974
1971 cFYI(1,("Negotiate caps 0x%x",(int)cap)); 1975 cFYI(1,("Negotiate caps 0x%x",(int)cap));
1972 1976#ifdef CONFIG_CIFS_DEBUG2
1977 if(cap & CIFS_UNIX_FCNTL_CAP)
1978 cFYI(1,("FCNTL cap"));
1979 if(cap & CIFS_UNIX_EXTATTR_CAP)
1980 cFYI(1,("EXTATTR cap"));
1981 if(cap & CIFS_UNIX_POSIX_PATHNAMES_CAP)
1982 cFYI(1,("POSIX path cap"));
1983 if(cap & CIFS_UNIX_XATTR_CAP)
1984 cFYI(1,("XATTR cap"));
1985 if(cap & CIFS_UNIX_POSIX_ACL_CAP)
1986 cFYI(1,("POSIX ACL cap"));
1987#endif /* CIFS_DEBUG2 */
1973 if (CIFSSMBSetFSUnixInfo(xid, tcon, cap)) { 1988 if (CIFSSMBSetFSUnixInfo(xid, tcon, cap)) {
1974 cFYI(1,("setting capabilities failed")); 1989 cFYI(1,("setting capabilities failed"));
1975 } 1990 }