Skip to content

For next #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hclee wants to merge 1 commit into
base: ntfs-next
Choose a base branch
from
+11 −9
Open

For next #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ea.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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));
Expand Down
16 changes: 9 additions & 7 deletions inode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down