public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yi Yang <yang.y.yi@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Zach Brown <zab@zabbo.net>, Andrew Morton <akpm@osdl.org>,
	linux-aio <linux-aio@kvack.org>,
	torvalds@osdl.org
Subject: [2.6.18-rc5 PATCH]: aio cleanup
Date: Wed, 30 Aug 2006 22:19:37 +0800	[thread overview]
Message-ID: <44F59E79.2080402@gmail.com> (raw)
In-Reply-To: <44F48825.4050408@zabbo.net>

As Zach Brown said, a cleanup patch is reasonable. Here it is.

This patch extracts the common part from aio_fsync and aio_fdsync
 and define a new inlined function aio_xsync, then aio_fsync and 
aio_fdsync just call aio_xsunc in the almost same way except second
 argument is different, one is 1 and another 0.

--- a/fs/aio.c.orig	2006-08-30 22:00:00.000000000 +0800
+++ b/fs/aio.c	2006-08-30 22:08:35.000000000 +0800
@@ -1363,24 +1363,24 @@ static ssize_t aio_pwrite(struct kiocb *
 	return ret;
 }
 
-static ssize_t aio_fdsync(struct kiocb *iocb)
+static inline ssize_t aio_xsync(struct kiocb *iocb, int flags)
 {
 	struct file *file = iocb->ki_filp;
 	ssize_t ret = -EINVAL;
 
 	if (file->f_op->aio_fsync)
-		ret = file->f_op->aio_fsync(iocb, 1);
+		ret = file->f_op->aio_fsync(iocb, flags);
 	return ret;
 }
 
-static ssize_t aio_fsync(struct kiocb *iocb)
+static ssize_t aio_fdsync(struct kiocb *iocb)
 {
-	struct file *file = iocb->ki_filp;
-	ssize_t ret = -EINVAL;
+	return aio_xsync(iocb, 1);
+}
 
-	if (file->f_op->aio_fsync)
-		ret = file->f_op->aio_fsync(iocb, 0);
-	return ret;
+static ssize_t aio_fsync(struct kiocb *iocb)
+{
+	return aio_xsync(iocb, 0);
 }
 
 /*



  parent reply	other threads:[~2006-08-30 14:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-29 13:21 [2.6.18-rc* PATCH RFC]: Correct ambiguous errno of aio Yi Yang
2006-08-29 18:32 ` Zach Brown
2006-08-29 19:04   ` Benjamin LaHaise
2006-08-30 14:19   ` Yi Yang [this message]
2006-08-30 16:30     ` [2.6.18-rc5 PATCH]: aio cleanup Zach Brown
     [not found]   ` <4c4443230608300651n34e8dbbdn8749c6874ce8791@mail.gmail.com>
2006-08-30 16:35     ` [2.6.18-rc* PATCH RFC]: Correct ambiguous errno of aio Zach Brown

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=44F59E79.2080402@gmail.com \
    --to=yang.y.yi@gmail.com \
    --cc=akpm@osdl.org \
    --cc=linux-aio@kvack.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    --cc=zab@zabbo.net \
    /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