linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erez Zadok <ezk@cs.sunysb.edu>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	viro@ftp.linux.org.uk, hch@infradead.org,
	Erez Zadok <ezk@cs.sunysb.edu>
Subject: [PATCH 16/16] Unionfs: use generic_file_aio_read/write
Date: Mon, 26 Nov 2007 11:44:13 -0500	[thread overview]
Message-ID: <1196095460975-git-send-email-ezk@cs.sunysb.edu> (raw)
In-Reply-To: <11960954531503-git-send-email-ezk@cs.sunysb.edu>

There's no apparent need to define our own aio_read/write methods.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---
 fs/unionfs/file.c |   27 ++-------------------------
 1 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index b7d0d55..c922173 100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -37,29 +37,6 @@ out:
 	return err;
 }
 
-static ssize_t unionfs_aio_read(struct kiocb *iocb, const struct iovec *iov,
-				unsigned long nr_segs, loff_t pos)
-{
-	int err = 0;
-	struct file *file = iocb->ki_filp;
-
-	unionfs_read_lock(file->f_path.dentry->d_sb);
-	err = unionfs_file_revalidate(file, false);
-	if (unlikely(err))
-		goto out;
-	unionfs_check_file(file);
-
-	err = generic_file_aio_read(iocb, iov, nr_segs, pos);
-
-	if (err == -EIOCBQUEUED)
-		err = wait_on_sync_kiocb(iocb);
-
-out:
-	unionfs_check_file(file);
-	unionfs_read_unlock(file->f_path.dentry->d_sb);
-	return err;
-}
-
 static ssize_t unionfs_write(struct file *file, const char __user *buf,
 			     size_t count, loff_t *ppos)
 {
@@ -234,9 +211,9 @@ out:
 struct file_operations unionfs_main_fops = {
 	.llseek		= generic_file_llseek,
 	.read		= unionfs_read,
-	.aio_read       = unionfs_aio_read,
+	.aio_read	= generic_file_aio_read,
 	.write		= unionfs_write,
-	.aio_write      = generic_file_aio_write,
+	.aio_write	= generic_file_aio_write,
 	.readdir	= unionfs_file_readdir,
 	.unlocked_ioctl	= unionfs_ioctl,
 	.mmap		= unionfs_mmap,
-- 
1.5.2.2


      parent reply	other threads:[~2007-11-26 16:45 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-26 16:43 [GIT PULL -mm] 00/16 Unionfs updates/fixes/cleanups Erez Zadok
2007-11-26 16:43 ` [PATCH 01/16] Unionfs: use f_path instead of f_dentry/mnt Erez Zadok
2007-11-26 16:43 ` [PATCH 02/16] Unionfs: minor cleanup in writepage Erez Zadok
2007-11-26 16:44 ` [PATCH 03/16] Unionfs: minor coding standards applied Erez Zadok
2007-11-26 16:44 ` [PATCH 04/16] Unionfs: minor cleanup in the debugging infrastructure Erez Zadok
2007-11-26 16:44 ` [PATCH 05/16] Unionfs: set lower mnt after mkdir which resulted in copyup Erez Zadok
2007-11-26 16:44 ` [PATCH 06/16] Unionfs: handle whiteouts more efficiently in filldir Erez Zadok
2007-11-26 16:44 ` [PATCH 07/16] Unionfs: remove useless debugging messages Erez Zadok
2007-11-26 16:44 ` [PATCH 08/16] Unionfs: release lower resources on successful rmdir Erez Zadok
2007-11-26 16:44 ` [PATCH 09/16] Unionfs: don't create whiteouts on rightmost branch Erez Zadok
2007-11-26 16:44 ` [PATCH 10/16] Unionfs: create opaque directories' whiteouts unconditionally Erez Zadok
2007-11-26 16:44 ` [PATCH 11/16] Unionfs: update times in setattr Erez Zadok
2007-11-26 16:44 ` [PATCH 12/16] Unionfs: reintroduce a bmap method Erez Zadok
2007-11-26 16:44 ` [PATCH 13/16] Unionfs: support splice(2) Erez Zadok
2007-11-26 16:44 ` [PATCH 14/16] Unionfs: prevent multiple writers to lower_page Erez Zadok
2007-11-26 16:44 ` [PATCH 15/16] Unionfs: update our inode size correctly upon partial write Erez Zadok
2007-11-26 16:44 ` Erez Zadok [this message]

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=1196095460975-git-send-email-ezk@cs.sunysb.edu \
    --to=ezk@cs.sunysb.edu \
    --cc=akpm@linux-foundation.org \
    --cc=hch@infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@ftp.linux.org.uk \
    /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;
as well as URLs for NNTP newsgroup(s).