From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oren Laadan Subject: [C/R v20][PATCH 20/96] c/r: make file_pos_read/write() public Date: Thu, 18 Mar 2010 20:59:45 -0400 Message-ID: <1268960401-16680-2-git-send-email-orenl@cs.columbia.edu> References: <1268960401-16680-1-git-send-email-orenl@cs.columbia.edu> Cc: containers@lists.linux-foundation.org, Matt Helsley , Andreas Dilger , Oren Laadan To: linux-fsdevel@vger.kernel.org Return-path: Received: from tarap.cc.columbia.edu ([128.59.29.7]:46848 "EHLO tarap.cc.columbia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753036Ab0CSBAT (ORCPT ); Thu, 18 Mar 2010 21:00:19 -0400 In-Reply-To: <1268960401-16680-1-git-send-email-orenl@cs.columbia.edu> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: These two are used in the next patch when calling vfs_read/write() Signed-off-by: Oren Laadan Acked-by: Serge E. Hallyn --- fs/read_write.c | 10 ---------- include/linux/fs.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index b7f4a1f..e258301 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -359,16 +359,6 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ EXPORT_SYMBOL(vfs_write); -static inline loff_t file_pos_read(struct file *file) -{ - return file->f_pos; -} - -static inline void file_pos_write(struct file *file, loff_t pos) -{ - file->f_pos = pos; -} - SYSCALL_DEFINE3(read, unsigned int, fd, char __user *, buf, size_t, count) { struct file *file; diff --git a/include/linux/fs.h b/include/linux/fs.h index ebb1cd5..6c08df2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1543,6 +1543,16 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, struct iovec *fast_pointer, struct iovec **ret_pointer); +static inline loff_t file_pos_read(struct file *file) +{ + return file->f_pos; +} + +static inline void file_pos_write(struct file *file, loff_t pos) +{ + file->f_pos = pos; +} + extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t vfs_readv(struct file *, const struct iovec __user *, -- 1.6.3.3