* bfs_fsync() was the only place which could cause the
fs_vnode_ops::write_pages() to be called with fsReenter = true. Since this is no longer the case, the argument has become superfluous. For read_pages() it always was. Removed the argument from the functions and all functions that propagated it. * Some whitespace at the end of lines was removed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26579 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -119,11 +119,10 @@ struct fs_vnode_ops {
|
||||
/* VM file access */
|
||||
bool (*can_page)(fs_volume *volume, fs_vnode *vnode, void *cookie);
|
||||
status_t (*read_pages)(fs_volume *volume, fs_vnode *vnode, void *cookie,
|
||||
off_t pos, const iovec *vecs, size_t count, size_t *_numBytes,
|
||||
bool reenter);
|
||||
off_t pos, const iovec *vecs, size_t count, size_t *_numBytes);
|
||||
status_t (*write_pages)(fs_volume *volume, fs_vnode *vnode,
|
||||
void *cookie, off_t pos, const iovec *vecs, size_t count,
|
||||
size_t *_numBytes, bool reenter);
|
||||
size_t *_numBytes);
|
||||
|
||||
/* cache file access */
|
||||
status_t (*get_file_map)(fs_volume *volume, fs_vnode *vnode, off_t offset,
|
||||
@@ -299,9 +298,9 @@ extern status_t get_vnode_removed(fs_volume *volume, ino_t vnodeID,
|
||||
bool *removed);
|
||||
|
||||
extern status_t read_pages(int fd, off_t pos, const struct iovec *vecs,
|
||||
size_t count, size_t *_numBytes, bool fsReenter);
|
||||
size_t count, size_t *_numBytes);
|
||||
extern status_t write_pages(int fd, off_t pos, const struct iovec *vecs,
|
||||
size_t count, size_t *_numBytes, bool fsReenter);
|
||||
size_t count, size_t *_numBytes);
|
||||
extern status_t read_file_io_vec_pages(int fd,
|
||||
const struct file_io_vec *fileVecs, size_t fileVecCount,
|
||||
const struct iovec *vecs, size_t vecCount,
|
||||
|
||||
@@ -137,10 +137,10 @@ struct fssh_fs_vnode_ops {
|
||||
fssh_fs_cookie cookie);
|
||||
fssh_status_t (*read_pages)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
||||
fssh_fs_cookie cookie, fssh_off_t pos, const fssh_iovec *vecs,
|
||||
fssh_size_t count, fssh_size_t *_numBytes, bool reenter);
|
||||
fssh_size_t count, fssh_size_t *_numBytes);
|
||||
fssh_status_t (*write_pages)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
||||
fssh_fs_cookie cookie, fssh_off_t pos, const fssh_iovec *vecs,
|
||||
fssh_size_t count, fssh_size_t *_numBytes, bool reenter);
|
||||
fssh_size_t count, fssh_size_t *_numBytes);
|
||||
|
||||
/* cache file access */
|
||||
fssh_status_t (*get_file_map)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
||||
@@ -339,10 +339,10 @@ extern fssh_status_t fssh_get_vnode_removed(fssh_fs_volume *volume,
|
||||
|
||||
extern fssh_status_t fssh_read_pages(int fd, fssh_off_t pos,
|
||||
const struct fssh_iovec *vecs, fssh_size_t count,
|
||||
fssh_size_t *_numBytes, bool fsReenter);
|
||||
fssh_size_t *_numBytes);
|
||||
extern fssh_status_t fssh_write_pages(int fd, fssh_off_t pos,
|
||||
const struct fssh_iovec *vecs, fssh_size_t count,
|
||||
fssh_size_t *_numBytes, bool fsReenter);
|
||||
fssh_size_t *_numBytes);
|
||||
extern fssh_status_t fssh_read_file_io_vec_pages(int fd,
|
||||
const struct fssh_file_io_vec *fileVecs,
|
||||
fssh_size_t fileVecCount, const struct fssh_iovec *vecs,
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#define DEFAULT_FD_TABLE_SIZE 256
|
||||
#define MAX_FD_TABLE_SIZE 8192
|
||||
#define DEFAULT_NODE_MONITORS 4096
|
||||
#define DEFAULT_NODE_MONITORS 4096
|
||||
#define MAX_NODE_MONITORS 65536
|
||||
|
||||
#define B_UNMOUNT_BUSY_PARTITION 0x80000000
|
||||
@@ -64,7 +64,7 @@ typedef struct io_context {
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#endif
|
||||
|
||||
status_t vfs_init(struct kernel_args *args);
|
||||
status_t vfs_bootstrap_file_systems(void);
|
||||
@@ -94,9 +94,9 @@ void vfs_acquire_vnode(struct vnode *vnode);
|
||||
status_t vfs_get_cookie_from_fd(int fd, void **_cookie);
|
||||
bool vfs_can_page(struct vnode *vnode, void *cookie);
|
||||
status_t vfs_read_pages(struct vnode *vnode, void *cookie, off_t pos,
|
||||
const iovec *vecs, size_t count, size_t *_numBytes, bool fsReenter);
|
||||
const iovec *vecs, size_t count, size_t *_numBytes);
|
||||
status_t vfs_write_pages(struct vnode *vnode, void *cookie, off_t pos,
|
||||
const iovec *vecs, size_t count, size_t *_numBytes, bool fsReenter);
|
||||
const iovec *vecs, size_t count, size_t *_numBytes);
|
||||
status_t vfs_get_vnode_cache(struct vnode *vnode, struct VMCache **_cache,
|
||||
bool allocate);
|
||||
status_t vfs_get_file_map(struct vnode *vnode, off_t offset, size_t size,
|
||||
@@ -250,6 +250,6 @@ extern status_t _user_get_next_socket_stat(int family, uint32 *cookie,
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _KERNEL_VFS_H */
|
||||
|
||||
@@ -36,8 +36,8 @@ size_t vm_page_num_free_pages(void);
|
||||
size_t vm_page_num_available_pages(void);
|
||||
|
||||
status_t vm_page_write_modified_page_range(struct VMCache *cache,
|
||||
uint32 firstPage, uint32 endPage, bool fsReenter);
|
||||
status_t vm_page_write_modified_pages(struct VMCache *cache, bool fsReenter);
|
||||
uint32 firstPage, uint32 endPage);
|
||||
status_t vm_page_write_modified_pages(struct VMCache *cache);
|
||||
void vm_page_schedule_write_page(struct vm_page *page);
|
||||
void vm_page_schedule_write_page_range(struct VMCache *cache,
|
||||
uint32 firstPage, uint32 endPage);
|
||||
|
||||
@@ -202,7 +202,7 @@ public:
|
||||
status_t InsertAreaLocked(vm_area* area);
|
||||
status_t RemoveArea(vm_area* area);
|
||||
|
||||
status_t WriteModified(bool fsReenter);
|
||||
status_t WriteModified();
|
||||
status_t SetMinimalCommitment(off_t commitment);
|
||||
status_t Resize(off_t newSize);
|
||||
|
||||
@@ -217,9 +217,9 @@ public:
|
||||
virtual bool HasPage(off_t offset);
|
||||
|
||||
virtual status_t Read(off_t offset, const iovec *vecs, size_t count,
|
||||
size_t *_numBytes, bool fsReenter);
|
||||
size_t *_numBytes);
|
||||
virtual status_t Write(off_t offset, const iovec *vecs, size_t count,
|
||||
size_t *_numBytes, bool fsReenter);
|
||||
size_t *_numBytes);
|
||||
|
||||
virtual status_t Fault(struct vm_address_space *aspace, off_t offset);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user