diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2011-10-22 14:37:50 +0400 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2011-10-22 12:29:35 -0500 |
| commit | 42274bb22afc3e877ae5abed787b0b09d7dede52 (patch) | |
| tree | b5ea479122408c396557975f52a13e8dd753cea1 /fs | |
| parent | a2d6b6cacb4fd4494b4037c01abb1332cefbb37b (diff) | |
| download | linux-3.10-42274bb22afc3e877ae5abed787b0b09d7dede52.tar.gz linux-3.10-42274bb22afc3e877ae5abed787b0b09d7dede52.tar.bz2 linux-3.10-42274bb22afc3e877ae5abed787b0b09d7dede52.zip | |
CIFS: Fix DFS handling in cifs_get_file_info
We should call cifs_all_info_to_fattr in rc == 0 case only.
Cc: <stable@kernel.org>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/inode.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 663c4e313be..2c50bd2f65d 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -562,7 +562,16 @@ int cifs_get_file_info(struct file *filp) xid = GetXid(); rc = CIFSSMBQFileInfo(xid, tcon, cfile->netfid, &find_data); - if (rc == -EOPNOTSUPP || rc == -EINVAL) { + switch (rc) { + case 0: + cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false); + break; + case -EREMOTE: + cifs_create_dfs_fattr(&fattr, inode->i_sb); + rc = 0; + break; + case -EOPNOTSUPP: + case -EINVAL: /* * FIXME: legacy server -- fall back to path-based call? * for now, just skip revalidating and mark inode for @@ -570,18 +579,14 @@ int cifs_get_file_info(struct file *filp) */ rc = 0; CIFS_I(inode)->time = 0; + default: goto cgfi_exit; - } else if (rc == -EREMOTE) { - cifs_create_dfs_fattr(&fattr, inode->i_sb); - rc = 0; - } else if (rc) - goto cgfi_exit; + } /* * don't bother with SFU junk here -- just mark inode as needing * revalidation. */ - cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false); fattr.cf_uniqueid = CIFS_I(inode)->uniqueid; fattr.cf_flags |= CIFS_FATTR_NEED_REVAL; cifs_fattr_to_inode(inode, &fattr); |