Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 11859
b: refs/heads/master
c: 1779381
h: refs/heads/master
i:
  11857: 26c9fb1
  11855: 77fd292
v: v3
  • Loading branch information
Miklos Szeredi authored and Linus Torvalds committed Oct 31, 2005
1 parent 0d43f30 commit 0d233dd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a38bccd0c63a4954ea4e1357cbff404aa321afb
refs/heads/master: 1779381dea3bada407396742c56bee31ffa8544e
6 changes: 3 additions & 3 deletions trunk/fs/fuse/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ void fuse_release_background(struct fuse_req *req)
/*
* This function is called when a request is finished. Either a reply
* has arrived or it was interrupted (and not yet sent) or some error
* occured during communication with userspace, or the device file was
* closed. It decreases the referece count for the request. In case
* of a background request the referece to the stored objects are
* occurred during communication with userspace, or the device file was
* closed. It decreases the reference count for the request. In case
* of a background request the reference to the stored objects are
* released. The requester thread is woken up (if still waiting), and
* finally the request is either freed or put on the unused_list
*
Expand Down
12 changes: 6 additions & 6 deletions trunk/fs/fuse/fuse_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -349,22 +349,22 @@ int fuse_fsync_common(struct file *file, struct dentry *de, int datasync,
int isdir);

/**
* Initialise file operations on a regular file
* Initialize file operations on a regular file
*/
void fuse_init_file_inode(struct inode *inode);

/**
* Initialise inode operations on regular files and special files
* Initialize inode operations on regular files and special files
*/
void fuse_init_common(struct inode *inode);

/**
* Initialise inode and file operations on a directory
* Initialize inode and file operations on a directory
*/
void fuse_init_dir(struct inode *inode);

/**
* Initialise inode operations on a symlink
* Initialize inode operations on a symlink
*/
void fuse_init_symlink(struct inode *inode);

Expand Down Expand Up @@ -411,7 +411,7 @@ struct fuse_req *fuse_get_request(struct fuse_conn *fc);

/**
* Decrement reference count of a request. If count goes to zero put
* on unused list (preallocated) or free reqest (not preallocated).
* on unused list (preallocated) or free request (not preallocated).
*/
void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req);

Expand All @@ -431,7 +431,7 @@ void request_send_noreply(struct fuse_conn *fc, struct fuse_req *req);
void request_send_background(struct fuse_conn *fc, struct fuse_req *req);

/**
* Release inodes and file assiciated with background request
* Release inodes and file associated with background request
*/
void fuse_release_background(struct fuse_req *req);

Expand Down

0 comments on commit 0d233dd

Please sign in to comment.