Merge tag 'overflow-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-2.6-block.git] / fs / cifs / dir.c

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 36e7b2fd2190b32462eba9c65c424408a15d0fe6..398c1eef71906fc5d3137e58ed41167aa8961963 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -411,6 +411,7 @@ cifs_create_get_file_info:
                rc = cifs_get_inode_info_unix(&newinode, full_path, inode->i_sb,
                                              xid);
        else {
+               /* TODO: Add support for calling POSIX query info here, but passing in fid */
                rc = cifs_get_inode_info(&newinode, full_path, buf, inode->i_sb,
                                         xid, fid);
                if (newinode) {
@@ -700,7 +701,9 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
        cifs_dbg(FYI, "Full path: %s inode = 0x%p\n",
                 full_path, d_inode(direntry));
 
-       if (pTcon->unix_ext) {
+       if (pTcon->posix_extensions)
+               rc = smb311_posix_get_inode_info(&newInode, full_path, parent_dir_inode->i_sb, xid);
+       else if (pTcon->unix_ext) {
                rc = cifs_get_inode_info_unix(&newInode, full_path,
                                              parent_dir_inode->i_sb, xid);
        } else {