]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'ovl/fileattr_v6' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 15 Apr 2021 21:18:15 +0000 (17:18 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 15 Apr 2021 21:18:15 +0000 (17:18 -0400)
1  2 
arch/riscv/include/asm/uaccess.h
fs/afs/inode.c
fs/cifs/file.c
fs/cifs/inode.c
fs/ecryptfs/inode.c
fs/fuse/dir.c
fs/nfs/inode.c
include/linux/fs.h

Simple merge
diff --cc fs/afs/inode.c
Simple merge
diff --cc fs/cifs/file.c
index 78266f0e05958d2023a63cd1a5af89c00b9ff965,042e24aad41098ac29c92c7d837deb5b6c806e19..b0033a3a14669de192e92b817810f27bb7200f7a
@@@ -165,7 -165,8 +165,8 @@@ int cifs_posix_open(char *full_path, st
                        goto posix_open_ret;
                }
        } else {
 -              cifs_fattr_to_inode(*pinode, &fattr);
+               cifs_revalidate_mapping(*pinode);
 +              rc = cifs_fattr_to_inode(*pinode, &fattr);
        }
  
  posix_open_ret:
diff --cc fs/cifs/inode.c
Simple merge
Simple merge
diff --cc fs/fuse/dir.c
Simple merge
diff --cc fs/nfs/inode.c
Simple merge
Simple merge