Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / fs / overlayfs / readdir.c

diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 914e77e10f0f3e6ef0867cb6f593c91d07a42c11..0daa4354fec4ae967da4ae43e81f7f833cd1095c 100644 (file)
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -772,7 +772,7 @@ static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end,
        if (!od->is_upper && OVL_TYPE_UPPER(ovl_path_type(dentry))) {
                struct inode *inode = file_inode(file);
 
        if (!od->is_upper && OVL_TYPE_UPPER(ovl_path_type(dentry))) {
                struct inode *inode = file_inode(file);
 

-               realfile = lockless_dereference(od->upperfile);
+               realfile = READ_ONCE(od->upperfile);

                if (!realfile) {
                        struct path upperpath;
 
                if (!realfile) {
                        struct path upperpath;