mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: miklos@szeredi.hu, ktkhai@virtuozzo.com,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/5] fuse: Do some refactoring in fuse_dev_do_write()
Date: Thu, 08 Nov 2018 12:05:36 +0300	[thread overview]
Message-ID: <154166793678.10655.10074946877439295638.stgit@localhost.localdomain> (raw)
In-Reply-To: <154166765576.10655.15178401490817622677.stgit@localhost.localdomain>

This is needed for next patch.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/fuse/dev.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index cc9e5a9bb147..7684fb7dc680 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1947,18 +1947,14 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,
 		__fuse_get_request(req);
 		spin_unlock(&fpq->lock);
 
-		err = -EINVAL;
-		if (nbytes != sizeof(struct fuse_out_header)) {
-			fuse_put_request(fc, req);
-			goto err_finish;
-		}
-
-		if (oh.error == -ENOSYS)
+		if (nbytes != sizeof(struct fuse_out_header))
+			nbytes = -EINVAL;
+		else if (oh.error == -ENOSYS)
 			fc->no_interrupt = 1;
 		else if (oh.error == -EAGAIN)
 			queue_interrupt(&fc->iq, req);
-		fuse_put_request(fc, req);
 
+		fuse_put_request(fc, req);
 		fuse_copy_finish(cs);
 		return nbytes;
 	}


  parent reply	other threads:[~2018-11-08  9:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-08  9:05 [PATCH v2 0/5] fuse: Interrupt-related optimizations and improvements Kirill Tkhai
2018-11-08  9:05 ` [PATCH v2 1/5] fuse: Kill fasync only if interrupt is queued in queue_interrupt() Kirill Tkhai
2018-11-08  9:05 ` [PATCH v2 2/5] fuse: Optimize request_end() by not taking fiq->waitq.lock Kirill Tkhai
2018-11-08  9:05 ` [PATCH v2 3/5] fuse: Wake up req->waitq of only not background requests in request_end() Kirill Tkhai
2018-11-08  9:05 ` Kirill Tkhai [this message]
2018-11-08  9:05 ` [PATCH v2 5/5] fuse: Verify userspace asks to requeue interrupt that we really sent Kirill Tkhai
2018-12-26 13:25 ` [PATCH v2 0/5] fuse: Interrupt-related optimizations and improvements Kirill Tkhai
2019-01-10  8:37   ` Miklos Szeredi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=154166793678.10655.10074946877439295638.stgit@localhost.localdomain \
    --to=ktkhai@virtuozzo.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®