i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTFS: Fix node creation functions.

Browse Source
This commit is contained in:
threedeyes
2012-10-19 00:58:05 +00:00
parent a814d85025
commit e90f1b178c
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/ntfs/fs_func.c
+21 -12
View File
@@ -953,10 +953,13 @@ fs_create(fs_volume *_vol, fs_vnode *_dir, const char *name, int omode,
} else } else
result = errno; result = errno;
} }
ntfs_inode_close(ni);
} else { } else {
le32 securid = 0; le32 securid = const_cpu_to_le32(0);
ni = ntfs_create(bi, securid, uname, unameLength, S_IFREG); ni = ntfs_create(bi, securid, uname, unameLength, S_IFREG);
if (ni) { if (ni) {
NInoSetDirty(ni);
*_vnid = MREF(ni->mft_no); *_vnid = MREF(ni->mft_no);
newNode = (vnode*)ntfs_calloc(sizeof(vnode)); newNode = (vnode*)ntfs_calloc(sizeof(vnode));
@@ -965,19 +968,23 @@ fs_create(fs_volume *_vol, fs_vnode *_dir, const char *name, int omode,
goto exit; goto exit;
} }
if (ntfs_inode_close_in_dir(ni, bi)) {
result = EINVAL;
goto exit;
}
newNode->vnid = *_vnid; newNode->vnid = *_vnid;
newNode->parent_vnid = MREF(bi->mft_no); newNode->parent_vnid = MREF(bi->mft_no);
set_mime(newNode, name); set_mime(newNode, name);
result = B_NO_ERROR; result = B_NO_ERROR;
result = publish_vnode(_vol, *_vnid, (void*)newNode,&gNTFSVnodeOps, result = publish_vnode(_vol, *_vnid, (void*)newNode, &gNTFSVnodeOps,
S_IFREG, 0); S_IFREG, 0);
ntfs_mark_free_space_outdated(ns); ntfs_mark_free_space_outdated(ns);
fs_ntfs_update_times(_vol, ni, NTFS_UPDATE_MCTIME); fs_ntfs_update_times(_vol, bi, NTFS_UPDATE_MCTIME);
notify_entry_created(ns->id, MREF(bi->mft_no), name, *_vnid); notify_entry_created(ns->id, MREF(bi->mft_no), name, *_vnid);
} else } else
result = errno; result = errno;
} }
@@ -990,8 +997,6 @@ exit:
if (na) if (na)
ntfs_attr_close(na); ntfs_attr_close(na);
if (ni)
ntfs_inode_close(ni);
if (bi) if (bi)
ntfs_inode_close(bi); ntfs_inode_close(bi);
free(uname); free(uname);
@@ -1423,7 +1428,7 @@ fs_mkdir(fs_volume *_vol, fs_vnode *_dir, const char *name, int perms)
ntfs_inode *ni = NULL; ntfs_inode *ni = NULL;
ntfs_inode *bi = NULL; ntfs_inode *bi = NULL;
status_t result = B_NO_ERROR; status_t result = B_NO_ERROR;
le32 securid = 0; le32 securid = const_cpu_to_le32(0);
if (ns->flags & B_FS_IS_READONLY) { if (ns->flags & B_FS_IS_READONLY) {
ERROR("ntfs is read-only\n"); ERROR("ntfs is read-only\n");
@@ -1460,12 +1465,19 @@ fs_mkdir(fs_volume *_vol, fs_vnode *_dir, const char *name, int perms)
if (ni) { if (ni) {
ino_t vnid = MREF(ni->mft_no); ino_t vnid = MREF(ni->mft_no);
NInoSetDirty(ni);
newNode = (vnode*)ntfs_calloc(sizeof(vnode)); newNode = (vnode*)ntfs_calloc(sizeof(vnode));
if (newNode == NULL) { if (newNode == NULL) {
result = ENOMEM; result = ENOMEM;
goto exit; goto exit;
} }
if (ntfs_inode_close_in_dir(ni, bi)) {
result = EINVAL;
goto exit;
}
newNode->vnid = vnid; newNode->vnid = vnid;
newNode->parent_vnid = MREF(bi->mft_no); newNode->parent_vnid = MREF(bi->mft_no);
set_mime(newNode, ".***"); set_mime(newNode, ".***");
@@ -1473,18 +1485,15 @@ fs_mkdir(fs_volume *_vol, fs_vnode *_dir, const char *name, int perms)
result = publish_vnode(_vol, vnid, (void*)newNode, &gNTFSVnodeOps, result = publish_vnode(_vol, vnid, (void*)newNode, &gNTFSVnodeOps,
S_IFDIR, 0); S_IFDIR, 0);
put_vnode(_vol, MREF(ni->mft_no)); put_vnode(_vol, vnid);
ntfs_mark_free_space_outdated(ns); ntfs_mark_free_space_outdated(ns);
fs_ntfs_update_times(_vol, ni, NTFS_UPDATE_MCTIME); fs_ntfs_update_times(_vol, bi, NTFS_UPDATE_MCTIME);
notify_entry_created(ns->id, MREF(bi->mft_no), name, vnid); notify_entry_created(ns->id, MREF(bi->mft_no), name, vnid);
} else } else
result = errno; result = errno;
exit: exit:
if (ni)
ntfs_inode_close(ni);
if (bi) if (bi)
ntfs_inode_close(bi); ntfs_inode_close(bi);
free(uname); free(uname);