diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 17:51:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 17:51:59 -0700 |
| commit | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (patch) | |
| tree | 0bb8477f775e48ab32900d254116288ee794441d /fs/cifs/cifsfs.c | |
| parent | 6585b572402e5ec7936422123b44b65fef7a5ea6 (diff) | |
| parent | b8c06a2ab68661bf841e21003f4447f8d422aed3 (diff) | |
| download | linux-3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a.tar.gz linux-3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a.tar.bz2 linux-3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a.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] statfs for cifs unix extensions no longer experimental
[CIFS] New POSIX locking code not setting rc properly to zero on successful
[CIFS] Support deep tree mounts (e.g. mounts to //server/share/path)
Diffstat (limited to 'fs/cifs/cifsfs.c')
| -rw-r--r-- | fs/cifs/cifsfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 3cd750029be2..c3ef1c0d0e68 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -189,7 +189,6 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_files = 0; /* undefined */ buf->f_ffree = 0; /* unlimited */ -#ifdef CONFIG_CIFS_EXPERIMENTAL /* BB we could add a second check for a QFS Unix capability bit */ /* BB FIXME check CIFS_POSIX_EXTENSIONS Unix cap first FIXME BB */ if ((pTcon->ses->capabilities & CAP_UNIX) && (CIFS_POSIX_EXTENSIONS & @@ -199,7 +198,6 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) /* Only need to call the old QFSInfo if failed on newer one */ if(rc) -#endif /* CIFS_EXPERIMENTAL */ rc = CIFSSMBQFSInfo(xid, pTcon, buf); /* Old Windows servers do not support level 103, retry with level |