Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 352887
b: refs/heads/master
c: b111c8c
h: refs/heads/master
i:
  352885: 218f02a
  352883: 2079440
  352879: e714c6c
v: v3
  • Loading branch information
Maxim Patlasov authored and Miklos Szeredi committed Jan 24, 2013
1 parent 5d476d5 commit 5944a11
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 46 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4250c0668ea10a19f3d37b1733f54ce6c8a37234
refs/heads/master: b111c8c0e3e5e780ae0758fc4c1c376a7c9d5997
2 changes: 1 addition & 1 deletion trunk/fs/fuse/cuse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ static int cuse_send_init(struct cuse_conn *cc)

BUILD_BUG_ON(CUSE_INIT_INFO_MAX > PAGE_SIZE);

req = fuse_get_req(fc);
req = fuse_get_req(fc, 1);
if (IS_ERR(req)) {
rc = PTR_ERR(req);
goto err;
Expand Down
13 changes: 7 additions & 6 deletions trunk/fs/fuse/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static void fuse_req_init_context(struct fuse_req *req)
req->in.h.pid = current->pid;
}

struct fuse_req *fuse_get_req(struct fuse_conn *fc)
struct fuse_req *fuse_get_req(struct fuse_conn *fc, unsigned npages)
{
struct fuse_req *req;
sigset_t oldset;
Expand All @@ -137,7 +137,7 @@ struct fuse_req *fuse_get_req(struct fuse_conn *fc)
if (!fc->connected)
goto out;

req = fuse_request_alloc(FUSE_MAX_PAGES_PER_REQ);
req = fuse_request_alloc(npages);
err = -ENOMEM;
if (!req)
goto out;
Expand Down Expand Up @@ -207,13 +207,14 @@ static void put_reserved_req(struct fuse_conn *fc, struct fuse_req *req)
* filesystem should not have it's own file open. If deadlock is
* intentional, it can still be broken by "aborting" the filesystem.
*/
struct fuse_req *fuse_get_req_nofail(struct fuse_conn *fc, struct file *file)
struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc,
struct file *file)
{
struct fuse_req *req;

atomic_inc(&fc->num_waiting);
wait_event(fc->blocked_waitq, !fc->blocked);
req = fuse_request_alloc(FUSE_MAX_PAGES_PER_REQ);
req = fuse_request_alloc(0);
if (!req)
req = get_reserved_req(fc, file);

Expand Down Expand Up @@ -521,7 +522,7 @@ void fuse_force_forget(struct file *file, u64 nodeid)

memset(&inarg, 0, sizeof(inarg));
inarg.nlookup = 1;
req = fuse_get_req_nofail(fc, file);
req = fuse_get_req_nofail_nopages(fc, file);
req->in.h.opcode = FUSE_FORGET;
req->in.h.nodeid = nodeid;
req->in.numargs = 1;
Expand Down Expand Up @@ -1577,7 +1578,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
unsigned int offset;
size_t total_len = 0;

req = fuse_get_req(fc);
req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down
38 changes: 19 additions & 19 deletions trunk/fs/fuse/dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
return -ECHILD;

fc = get_fuse_conn(inode);
req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return 0;

Expand Down Expand Up @@ -271,7 +271,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, struct qstr *name,
if (name->len > FUSE_NAME_MAX)
goto out;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
err = PTR_ERR(req);
if (IS_ERR(req))
goto out;
Expand Down Expand Up @@ -391,7 +391,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
if (!forget)
goto out_err;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
err = PTR_ERR(req);
if (IS_ERR(req))
goto out_put_forget_req;
Expand Down Expand Up @@ -592,7 +592,7 @@ static int fuse_mknod(struct inode *dir, struct dentry *entry, umode_t mode,
{
struct fuse_mknod_in inarg;
struct fuse_conn *fc = get_fuse_conn(dir);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -623,7 +623,7 @@ static int fuse_mkdir(struct inode *dir, struct dentry *entry, umode_t mode)
{
struct fuse_mkdir_in inarg;
struct fuse_conn *fc = get_fuse_conn(dir);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand All @@ -647,7 +647,7 @@ static int fuse_symlink(struct inode *dir, struct dentry *entry,
{
struct fuse_conn *fc = get_fuse_conn(dir);
unsigned len = strlen(link) + 1;
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand All @@ -664,7 +664,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry)
{
int err;
struct fuse_conn *fc = get_fuse_conn(dir);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -696,7 +696,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry)
{
int err;
struct fuse_conn *fc = get_fuse_conn(dir);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand All @@ -723,7 +723,7 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
int err;
struct fuse_rename_in inarg;
struct fuse_conn *fc = get_fuse_conn(olddir);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);

if (IS_ERR(req))
return PTR_ERR(req);
Expand Down Expand Up @@ -776,7 +776,7 @@ static int fuse_link(struct dentry *entry, struct inode *newdir,
struct fuse_link_in inarg;
struct inode *inode = entry->d_inode;
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -848,7 +848,7 @@ static int fuse_do_getattr(struct inode *inode, struct kstat *stat,
struct fuse_req *req;
u64 attr_version;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1029,7 +1029,7 @@ static int fuse_access(struct inode *inode, int mask)
if (fc->no_access)
return 0;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1305,7 +1305,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
if (is_bad_inode(inode))
return -EIO;

req = fuse_get_req(fc);
req = fuse_get_req(fc, 1);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1349,7 +1349,7 @@ static char *read_link(struct dentry *dentry)
{
struct inode *inode = dentry->d_inode;
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_req *req = fuse_get_req(fc);
struct fuse_req *req = fuse_get_req_nopages(fc);
char *link;

if (IS_ERR(req))
Expand Down Expand Up @@ -1562,7 +1562,7 @@ static int fuse_do_setattr(struct dentry *entry, struct iattr *attr,
if (attr->ia_valid & ATTR_SIZE)
is_truncate = true;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1670,7 +1670,7 @@ static int fuse_setxattr(struct dentry *entry, const char *name,
if (fc->no_setxattr)
return -EOPNOTSUPP;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1709,7 +1709,7 @@ static ssize_t fuse_getxattr(struct dentry *entry, const char *name,
if (fc->no_getxattr)
return -EOPNOTSUPP;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1761,7 +1761,7 @@ static ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size)
if (fc->no_listxattr)
return -EOPNOTSUPP;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1806,7 +1806,7 @@ static int fuse_removexattr(struct dentry *entry, const char *name)
if (fc->no_removexattr)
return -EOPNOTSUPP;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down
30 changes: 15 additions & 15 deletions trunk/fs/fuse/file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static int fuse_send_open(struct fuse_conn *fc, u64 nodeid, struct file *file,
struct fuse_req *req;
int err;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -368,7 +368,7 @@ static int fuse_flush(struct file *file, fl_owner_t id)
if (fc->no_flush)
return 0;

req = fuse_get_req_nofail(fc, file);
req = fuse_get_req_nofail_nopages(fc, file);
memset(&inarg, 0, sizeof(inarg));
inarg.fh = ff->fh;
inarg.lock_owner = fuse_lock_owner_id(fc, id);
Expand Down Expand Up @@ -436,7 +436,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end,

fuse_sync_writes(inode);

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req)) {
err = PTR_ERR(req);
goto out;
Expand Down Expand Up @@ -544,7 +544,7 @@ static int fuse_readpage(struct file *file, struct page *page)
*/
fuse_wait_on_page_writeback(inode, page->index);

req = fuse_get_req(fc);
req = fuse_get_req(fc, 1);
err = PTR_ERR(req);
if (IS_ERR(req))
goto out;
Expand Down Expand Up @@ -657,7 +657,7 @@ static int fuse_readpages_fill(void *_data, struct page *page)
(req->num_pages + 1) * PAGE_CACHE_SIZE > fc->max_read ||
req->pages[req->num_pages - 1]->index + 1 != page->index)) {
fuse_send_readpages(req, data->file);
data->req = req = fuse_get_req(fc);
data->req = req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
if (IS_ERR(req)) {
unlock_page(page);
return PTR_ERR(req);
Expand All @@ -683,7 +683,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,

data.file = file;
data.inode = inode;
data.req = fuse_get_req(fc);
data.req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
err = PTR_ERR(data.req);
if (IS_ERR(data.req))
goto out;
Expand Down Expand Up @@ -890,7 +890,7 @@ static ssize_t fuse_perform_write(struct file *file,
struct fuse_req *req;
ssize_t count;

req = fuse_get_req(fc);
req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
if (IS_ERR(req)) {
err = PTR_ERR(req);
break;
Expand Down Expand Up @@ -1072,7 +1072,7 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
ssize_t res = 0;
struct fuse_req *req;

req = fuse_get_req(fc);
req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1108,7 +1108,7 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
break;
if (count) {
fuse_put_request(fc, req);
req = fuse_get_req(fc);
req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
if (IS_ERR(req))
break;
}
Expand Down Expand Up @@ -1471,7 +1471,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
struct fuse_lk_out outarg;
int err;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1506,7 +1506,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
if (fl->fl_flags & FL_CLOSE)
return 0;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down Expand Up @@ -1575,7 +1575,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
if (!inode->i_sb->s_bdev || fc->no_bmap)
return 0;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return 0;

Expand Down Expand Up @@ -1873,7 +1873,7 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
num_pages++;
}

req = fuse_get_req(fc);
req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ);
if (IS_ERR(req)) {
err = PTR_ERR(req);
req = NULL;
Expand Down Expand Up @@ -2076,7 +2076,7 @@ unsigned fuse_file_poll(struct file *file, poll_table *wait)
fuse_register_polled_file(fc, ff);
}

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return POLLERR;

Expand Down Expand Up @@ -2194,7 +2194,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
if (fc->no_fallocate)
return -EOPNOTSUPP;

req = fuse_get_req(fc);
req = fuse_get_req_nopages(fc);
if (IS_ERR(req))
return PTR_ERR(req);

Expand Down
Loading

0 comments on commit 5944a11

Please sign in to comment.