ntfs: fix WSL ea restore condition

Use NTFS_VOL_GID(not NTFS_VOL_UID) for restoring the gid, and call
ntfs_ea_get_wsl_inode() only when $EA_INFORMATION exists.

Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>

diff --git a/fs/ntfs/ea.c b/fs/ntfs/ea.c
index 5b108d0ccec7b15ce027a94f948ae8ae009f68af..386eb0c5f303dec6e20362edd09f58afb029914c 100644 (file)
--- a/fs/ntfs/ea.c
+++ b/fs/ntfs/ea.c
@@ -368,7 +368,7 @@ int ntfs_ea_get_wsl_inode(struct inode *inode, dev_t *rdevp, unsigned int flags)
                i_uid_write(inode, le32_to_cpu(v));
        }
 
-       if (!(flags & NTFS_VOL_UID)) {
+       if (!(flags & NTFS_VOL_GID)) {
                /* Load gid to lxgid EA */
                err = ntfs_get_ea(inode, "$LXGID", sizeof("$LXGID") - 1, &v,
                                sizeof(v));

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 43d7ecc14c150e19961c244f7f6612a0990efef6..7547174a99ae02470a426befc55533251be1a6cc 100644 (file)
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -865,10 +865,10 @@ static int ntfs_read_locked_inode(struct inode *vi)
        }
 skip_attr_list_load:
        err = ntfs_attr_lookup(AT_EA_INFORMATION, NULL, 0, 0, 0, NULL, 0, ctx);
-       if (!err)
+       if (!err) {
                NInoSetHasEA(ni);
-
-       ntfs_ea_get_wsl_inode(vi, &dev, flags);
+               ntfs_ea_get_wsl_inode(vi, &dev, flags);
+       }
 
        if (m->flags & MFT_RECORD_IS_DIRECTORY) {
                vi->i_mode |= S_IFDIR;