diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 08:09:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 08:09:49 -0800 |
| commit | 170926993a320cd7b53c388e6ffc759de4fac472 (patch) | |
| tree | 69227df9ed9e9652c86033872350c1f7ad6e3522 /fs/cifs/inode.c | |
| parent | 189e7cc1e092a31183febe598f8e37385ff9936e (diff) | |
| parent | f7b2e8c76b3423a1d2501b9399261e9c9a33e100 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix minor problem with previous patch
[CIFS] Fix mount failure when domain not specified
[CIFS] Explicitly set stat->blksize
[CIFS] NFS stress test generates flood of "close with pending write" messages
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index dffe295825f..1ad8c9fcc74 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1089,8 +1089,10 @@ int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) { int err = cifs_revalidate(dentry); - if (!err) + if (!err) { generic_fillattr(dentry->d_inode, stat); + stat->blksize = CIFS_MAX_MSGSIZE; + } return err; } |