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

* All file descriptors that only refer to a mount now keep the mount, ie. they

Browse Source 
won't call put_mount() before they are freed. Internally, this causes them
  to grab a reference to the mount's root vnode.
* This fixes bug #3262.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28850 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-01-06 21:17:47 +00:00
parent 74010f9911
commit 5500d8a54f
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+20 -24
View File
@@ -6450,24 +6450,23 @@ index_dir_open(dev_t mountID, bool kernel)
if (!HAS_FS_MOUNT_CALL(mount, open_index_dir)) { if (!HAS_FS_MOUNT_CALL(mount, open_index_dir)) {
status = EOPNOTSUPP; status = EOPNOTSUPP;
goto out; goto error;
} }
status = FS_MOUNT_CALL(mount, open_index_dir, &cookie); status = FS_MOUNT_CALL(mount, open_index_dir, &cookie);
if (status < B_OK) if (status < B_OK)
goto out; goto error;
// get fd for the index directory // get fd for the index directory
status = get_new_fd(FDTYPE_INDEX_DIR, mount, NULL, cookie, 0, kernel); status = get_new_fd(FDTYPE_INDEX_DIR, mount, NULL, cookie, 0, kernel);
if (status >= 0) if (status < 0) {
goto out; // something went wrong
FS_MOUNT_CALL(mount, close_index_dir, cookie);
FS_MOUNT_CALL(mount, free_index_dir_cookie, cookie);
// something went wrong error:
FS_MOUNT_CALL(mount, close_index_dir, cookie); put_mount(mount);
FS_MOUNT_CALL(mount, free_index_dir_cookie, cookie); }
out:
put_mount(mount);
return status; return status;
} }
@@ -6493,8 +6492,7 @@ index_dir_free_fd(struct file_descriptor *descriptor)
if (mount != NULL) { if (mount != NULL) {
FS_MOUNT_CALL(mount, free_index_dir_cookie, descriptor->cookie); FS_MOUNT_CALL(mount, free_index_dir_cookie, descriptor->cookie);
// ToDo: find a replacement ref_count object - perhaps the root dir? put_mount(mount);
//put_vnode(vnode);
} }
} }
@@ -6644,25 +6642,24 @@ query_open(dev_t device, const char *query, uint32 flags,
if (!HAS_FS_MOUNT_CALL(mount, open_query)) { if (!HAS_FS_MOUNT_CALL(mount, open_query)) {
status = EOPNOTSUPP; status = EOPNOTSUPP;
goto out; goto error;
} }
status = FS_MOUNT_CALL(mount, open_query, query, flags, port, token, status = FS_MOUNT_CALL(mount, open_query, query, flags, port, token,
&cookie); &cookie);
if (status < B_OK) if (status < B_OK)
goto out; goto error;
// get fd for the index directory // get fd for the index directory
status = get_new_fd(FDTYPE_QUERY, mount, NULL, cookie, 0, kernel); status = get_new_fd(FDTYPE_QUERY, mount, NULL, cookie, 0, kernel);
if (status >= 0) if (status < 0) {
goto out; // something went wrong
FS_MOUNT_CALL(mount, close_query, cookie);
FS_MOUNT_CALL(mount, free_query_cookie, cookie);
// something went wrong error:
FS_MOUNT_CALL(mount, close_query, cookie); put_mount(mount);
FS_MOUNT_CALL(mount, free_query_cookie, cookie); }
out:
put_mount(mount);
return status; return status;
} }
@@ -6688,8 +6685,7 @@ query_free_fd(struct file_descriptor *descriptor)
if (mount != NULL) { if (mount != NULL) {
FS_MOUNT_CALL(mount, free_query_cookie, descriptor->cookie); FS_MOUNT_CALL(mount, free_query_cookie, descriptor->cookie);
// ToDo: find a replacement ref_count object - perhaps the root dir? put_mount(mount);
//put_vnode(vnode);
} }
} }