ntfs: fix LXUID/LXGID restore condition

Restore LXUID/LXGID in ntfs_ea_get_wsl_inode()
when NTFS_VOL_UID/NTFS_VOL_GID is set.

And call ntfs_ea_get_wsl_inode with
NTFS_VOL_UID/NTFS_VOL_GID only when
the uid/gid mount option is not specified.

Signed-off-by: Hyunchul Lee <hyc.lee@gmail.com>

Author: hclee

ea.c

@@ -359,7 +359,7 @@ int ntfs_ea_get_wsl_inode(struct inode *inode, dev_t *rdevp, unsigned int flags)
 	int err;
 	__le32 v;
 
-	if (!(flags & NTFS_VOL_UID)) {
+	if (flags & NTFS_VOL_UID) {
 		/* Load uid to lxuid EA */
 		err = ntfs_get_ea(inode, "$LXUID", sizeof("$LXUID") - 1, &v,
 				sizeof(v));
@@ -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_UID) {
 		/* Load gid to lxgid EA */
 		err = ntfs_get_ea(inode, "$LXGID", sizeof("$LXGID") - 1, &v,
 				sizeof(v));

inode.c

@@ -726,15 +726,17 @@ static int ntfs_read_locked_inode(struct inode *vi)
 
 	if (uid_valid(vol->uid)) {
 		vi->i_uid = vol->uid;
-		flags |= NTFS_VOL_UID;
-	} else
+	} else {
 		vi->i_uid = GLOBAL_ROOT_UID;
+		flags |= NTFS_VOL_UID;
+	}
 
 	if (gid_valid(vol->gid)) {
 		vi->i_gid = vol->gid;
-		flags |= NTFS_VOL_GID;
-	} else
+	} else {
 		vi->i_gid = GLOBAL_ROOT_GID;
+		flags |= NTFS_VOL_GID;
+	}
 
 	vi->i_mode = 0777;
 
@@ -917,10 +919,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;