diff options
| author | Jeff Layton <jlayton@redhat.com> | 2012-07-06 13:09:42 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2012-07-17 06:57:23 +0200 |
| commit | cd60042cc1392e79410dc8de9e9c1abb38a29e57 (patch) | |
| tree | ed9ac9505a2e12e63b9a4a97f02790a59d69811b /fs/cifs/readdir.c | |
| parent | cifs: when CONFIG_HIGHMEM is set, serialize the read/write kmaps (diff) | |
| download | linux-cd60042cc1392e79410dc8de9e9c1abb38a29e57.tar.xz linux-cd60042cc1392e79410dc8de9e9c1abb38a29e57.zip | |
cifs: always update the inode cache with the results from a FIND_*
When we get back a FIND_FIRST/NEXT result, we have some info about the
dentry that we use to instantiate a new inode. We were ignoring and
discarding that info when we had an existing dentry in the cache.
Fix this by updating the inode in place when we find an existing dentry
and the uniqueid is the same.
Cc: <stable@vger.kernel.org> # .31.x
Reported-and-Tested-by: Andrew Bartlett <abartlet@samba.org>
Reported-by: Bill Robertson <bill_robertson@debortoli.com.au>
Reported-by: Dion Edwards <dion_edwards@debortoli.com.au>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/readdir.c')
| -rw-r--r-- | fs/cifs/readdir.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 0a8224d1c4c5..a4217f02fab2 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -86,9 +86,12 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name, dentry = d_lookup(parent, name); if (dentry) { - /* FIXME: check for inode number changes? */ - if (dentry->d_inode != NULL) + inode = dentry->d_inode; + /* update inode in place if i_ino didn't change */ + if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) { + cifs_fattr_to_inode(inode, fattr); return dentry; + } d_drop(dentry); dput(dentry); } |