From: Josef Bacik <josef@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com, viro@ZenIV.linux.org.uk Subject: [PATCH 1/4] fs: add SEEK_HOLE and SEEK_DATA flags Date: Tue, 28 Jun 2011 11:33:15 -0400 [thread overview] Message-ID: <1309275199-10801-1-git-send-email-josef@redhat.com> (raw) This just gets us ready to support the SEEK_HOLE and SEEK_DATA flags. Turns out using fiemap in things like cp cause more problems than it solves, so lets try and give userspace an interface that doesn't suck. We need to match solaris here, and the definitions are *o* If /whence/ is SEEK_HOLE, the offset of the start of the next hole greater than or equal to the supplied offset is returned. The definition of a hole is provided near the end of the DESCRIPTION. *o* If /whence/ is SEEK_DATA, the file pointer is set to the start of the next non-hole file region greater than or equal to the supplied offset. So in the generic case the entire file is data and there is a virtual hole at the end. That means we will just return i_size for SEEK_HOLE and will return the same offset for SEEK_DATA. This is how Solaris does it so we have to do it the same way. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com> --- fs/read_write.c | 44 +++++++++++++++++++++++++++++++++++++++++--- include/linux/fs.h | 4 +++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 5520f8a..5907b49 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -64,6 +64,23 @@ generic_file_llseek_unlocked(struct file *file, loff_t offset, int origin) return file->f_pos; offset += file->f_pos; break; + case SEEK_DATA: + /* + * In the generic case the entire file is data, so as long as + * offset isn't at the end of the file then the offset is data. + */ + if (offset >= inode->i_size) + return -ENXIO; + break; + case SEEK_HOLE: + /* + * There is a virtual hole at the end of the file, so as long as + * offset isn't i_size or larger, return i_size. + */ + if (offset >= inode->i_size) + return -ENXIO; + offset = inode->i_size; + break; } if (offset < 0 && !unsigned_offsets(file)) @@ -128,12 +145,13 @@ EXPORT_SYMBOL(no_llseek); loff_t default_llseek(struct file *file, loff_t offset, int origin) { + struct inode *inode = file->f_path.dentry->d_inode; loff_t retval; - mutex_lock(&file->f_dentry->d_inode->i_mutex); + mutex_lock(&inode->i_mutex); switch (origin) { case SEEK_END: - offset += i_size_read(file->f_path.dentry->d_inode); + offset += i_size_read(inode); break; case SEEK_CUR: if (offset == 0) { @@ -141,6 +159,26 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin) goto out; } offset += file->f_pos; + break; + case SEEK_DATA: + /* + * In the generic case the entire file is data, so as + * long as offset isn't at the end of the file then the + * offset is data. + */ + if (offset >= inode->i_size) + return -ENXIO; + break; + case SEEK_HOLE: + /* + * There is a virtual hole at the end of the file, so + * as long as offset isn't i_size or larger, return + * i_size. + */ + if (offset >= inode->i_size) + return -ENXIO; + offset = inode->i_size; + break; } retval = -EINVAL; if (offset >= 0 || unsigned_offsets(file)) { @@ -151,7 +189,7 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin) retval = offset; } out: - mutex_unlock(&file->f_dentry->d_inode->i_mutex); + mutex_unlock(&inode->i_mutex); return retval; } EXPORT_SYMBOL(default_llseek); diff --git a/include/linux/fs.h b/include/linux/fs.h index b5b9792..c9156f3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -32,7 +32,9 @@ #define SEEK_SET 0 /* seek relative to beginning of file */ #define SEEK_CUR 1 /* seek relative to current file position */ #define SEEK_END 2 /* seek relative to end of file */ -#define SEEK_MAX SEEK_END +#define SEEK_DATA 3 /* seek to the next data */ +#define SEEK_HOLE 4 /* seek to the next hole */ +#define SEEK_MAX SEEK_HOLE struct fstrim_range { __u64 start; -- 1.7.5.2
WARNING: multiple messages have this Message-ID (diff)
From: Josef Bacik <josef@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com, viro@ZenIV.linux.org.uk Subject: [PATCH 1/4] fs: add SEEK_HOLE and SEEK_DATA flags Date: Tue, 28 Jun 2011 11:33:15 -0400 [thread overview] Message-ID: <1309275199-10801-1-git-send-email-josef@redhat.com> (raw) This just gets us ready to support the SEEK_HOLE and SEEK_DATA flags. Turns out using fiemap in things like cp cause more problems than it solves, so lets try and give userspace an interface that doesn't suck. We need to match solaris here, and the definitions are *o* If /whence/ is SEEK_HOLE, the offset of the start of the next hole greater than or equal to the supplied offset is returned. The definition of a hole is provided near the end of the DESCRIPTION. *o* If /whence/ is SEEK_DATA, the file pointer is set to the start of the next non-hole file region greater than or equal to the supplied offset. So in the generic case the entire file is data and there is a virtual hole at the end. That means we will just return i_size for SEEK_HOLE and will return the same offset for SEEK_DATA. This is how Solaris does it so we have to do it the same way. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com> --- fs/read_write.c | 44 +++++++++++++++++++++++++++++++++++++++++--- include/linux/fs.h | 4 +++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 5520f8a..5907b49 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -64,6 +64,23 @@ generic_file_llseek_unlocked(struct file *file, loff_t offset, int origin) return file->f_pos; offset += file->f_pos; break; + case SEEK_DATA: + /* + * In the generic case the entire file is data, so as long as + * offset isn't at the end of the file then the offset is data. + */ + if (offset >= inode->i_size) + return -ENXIO; + break; + case SEEK_HOLE: + /* + * There is a virtual hole at the end of the file, so as long as + * offset isn't i_size or larger, return i_size. + */ + if (offset >= inode->i_size) + return -ENXIO; + offset = inode->i_size; + break; } if (offset < 0 && !unsigned_offsets(file)) @@ -128,12 +145,13 @@ EXPORT_SYMBOL(no_llseek); loff_t default_llseek(struct file *file, loff_t offset, int origin) { + struct inode *inode = file->f_path.dentry->d_inode; loff_t retval; - mutex_lock(&file->f_dentry->d_inode->i_mutex); + mutex_lock(&inode->i_mutex); switch (origin) { case SEEK_END: - offset += i_size_read(file->f_path.dentry->d_inode); + offset += i_size_read(inode); break; case SEEK_CUR: if (offset == 0) { @@ -141,6 +159,26 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin) goto out; } offset += file->f_pos; + break; + case SEEK_DATA: + /* + * In the generic case the entire file is data, so as + * long as offset isn't at the end of the file then the + * offset is data. + */ + if (offset >= inode->i_size) + return -ENXIO; + break; + case SEEK_HOLE: + /* + * There is a virtual hole at the end of the file, so + * as long as offset isn't i_size or larger, return + * i_size. + */ + if (offset >= inode->i_size) + return -ENXIO; + offset = inode->i_size; + break; } retval = -EINVAL; if (offset >= 0 || unsigned_offsets(file)) { @@ -151,7 +189,7 @@ loff_t default_llseek(struct file *file, loff_t offset, int origin) retval = offset; } out: - mutex_unlock(&file->f_dentry->d_inode->i_mutex); + mutex_unlock(&inode->i_mutex); return retval; } EXPORT_SYMBOL(default_llseek); diff --git a/include/linux/fs.h b/include/linux/fs.h index b5b9792..c9156f3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -32,7 +32,9 @@ #define SEEK_SET 0 /* seek relative to beginning of file */ #define SEEK_CUR 1 /* seek relative to current file position */ #define SEEK_END 2 /* seek relative to end of file */ -#define SEEK_MAX SEEK_END +#define SEEK_DATA 3 /* seek to the next data */ +#define SEEK_HOLE 4 /* seek to the next hole */ +#define SEEK_MAX SEEK_HOLE struct fstrim_range { __u64 start; -- 1.7.5.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2011-06-28 15:33 UTC|newest] Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-06-28 15:33 Josef Bacik [this message] 2011-06-28 15:33 ` [PATCH 1/4] fs: add SEEK_HOLE and SEEK_DATA flags Josef Bacik 2011-06-28 15:33 ` [PATCH 2/4] Btrfs: implement our own ->llseek Josef Bacik 2011-06-28 15:33 ` Josef Bacik 2011-06-28 15:33 ` [PATCH 3/4] Ext4: handle SEEK_HOLE/SEEK_DATA generically Josef Bacik 2011-06-28 15:33 ` Josef Bacik 2011-06-28 16:29 ` Andreas Dilger 2011-06-28 17:34 ` Josef Bacik 2011-06-28 15:33 ` [PATCH 4/4] fs: handle SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek Josef Bacik 2011-06-28 15:33 ` Josef Bacik 2011-06-28 15:33 ` [PATCH] xfstests 255: add a seek_data/seek_hole tester Josef Bacik 2011-06-28 15:33 ` Josef Bacik 2011-06-29 6:53 ` Dave Chinner 2011-06-29 6:53 ` Dave Chinner 2011-06-29 6:53 ` Dave Chinner 2011-06-29 6:53 ` Dave Chinner 2011-06-29 7:40 ` Christoph Hellwig 2011-06-29 7:40 ` Christoph Hellwig 2011-06-29 10:42 ` Pádraig Brady 2011-06-29 10:42 ` Pádraig Brady 2011-06-29 10:42 ` Pádraig Brady 2011-06-29 10:42 ` Pádraig Brady 2011-06-29 17:29 ` Sunil Mushran 2011-06-29 17:29 ` Sunil Mushran 2011-06-29 17:29 ` Sunil Mushran 2011-06-29 17:29 ` Sunil Mushran 2011-06-29 17:36 ` Christoph Hellwig 2011-06-29 17:36 ` Christoph Hellwig 2011-06-29 17:40 ` Sunil Mushran 2011-06-29 17:40 ` Sunil Mushran 2011-06-29 21:29 ` Pádraig Brady 2011-06-29 21:29 ` Pádraig Brady 2011-06-29 21:29 ` Pádraig Brady 2011-07-01 9:37 ` Christoph Hellwig 2011-07-01 9:37 ` Christoph Hellwig 2011-06-29 17:10 ` Sunil Mushran 2011-06-29 17:10 ` Sunil Mushran 2011-06-29 17:52 ` Josef Bacik 2011-06-29 17:52 ` Josef Bacik 2011-06-29 13:19 ` Josef Bacik 2011-06-29 13:19 ` Josef Bacik 2011-06-29 13:19 ` Josef Bacik 2011-08-25 6:06 ` Christoph Hellwig 2011-08-25 6:06 ` Christoph Hellwig 2011-08-25 6:40 ` Dave Chinner 2011-08-25 6:40 ` Dave Chinner 2011-08-25 6:51 ` Andreas Dilger 2011-08-25 6:51 ` Andreas Dilger 2011-08-26 1:35 ` Dave Chinner 2011-08-26 1:35 ` Dave Chinner 2011-08-26 6:24 ` Marco Stornelli 2011-08-26 6:24 ` Marco Stornelli 2011-08-26 6:24 ` Marco Stornelli 2011-08-26 14:41 ` Zach Brown 2011-08-26 14:41 ` Zach Brown 2011-08-26 14:41 ` Zach Brown 2011-08-26 14:41 ` Zach Brown 2011-08-27 8:30 ` Marco Stornelli 2011-08-27 8:30 ` Marco Stornelli 2011-08-28 10:17 ` Marco Stornelli 2011-08-28 10:17 ` Marco Stornelli 2011-08-30 17:42 ` Sunil Mushran 2011-08-30 17:42 ` Sunil Mushran 2011-08-31 1:17 ` Sunil Mushran 2011-08-31 1:17 ` Sunil Mushran 2011-08-31 3:29 ` Dave Chinner 2011-08-31 3:29 ` Dave Chinner 2011-08-31 3:53 ` david 2011-08-31 3:53 ` david 2011-08-31 4:43 ` Sunil Mushran 2011-08-31 4:43 ` Sunil Mushran 2011-08-31 9:05 ` Pádraig Brady 2011-08-31 9:05 ` Pádraig Brady 2011-08-31 9:05 ` Pádraig Brady 2011-08-31 4:48 ` Dan Merillat 2011-08-31 4:48 ` Dan Merillat 2011-07-29 9:58 ` [PATCH 1/4] fs: add SEEK_HOLE and SEEK_DATA flags Marco Stornelli 2011-07-29 9:58 ` Marco Stornelli 2011-08-20 9:41 ` Marco Stornelli 2011-08-20 9:41 ` Marco Stornelli 2011-08-20 10:03 ` Marco Stornelli 2011-08-20 10:03 ` Marco Stornelli 2011-08-20 15:36 ` Sunil Mushran 2011-08-20 15:36 ` Sunil Mushran 2011-08-20 16:32 ` Marco Stornelli 2011-08-20 16:32 ` Marco Stornelli 2011-08-22 6:08 ` Sunil Mushran 2011-08-22 6:08 ` Sunil Mushran 2011-08-22 10:56 ` Marco Stornelli 2011-08-22 10:56 ` Marco Stornelli 2011-08-22 10:56 ` Marco Stornelli 2011-08-22 10:56 ` Marco Stornelli 2011-08-22 15:57 ` Sunil Mushran 2011-08-22 15:57 ` Sunil Mushran 2011-08-22 17:56 ` Marco Stornelli 2011-08-22 17:56 ` Marco Stornelli 2011-08-22 21:22 ` Sunil Mushran 2011-08-22 21:22 ` Sunil Mushran 2011-08-23 17:44 ` Marco Stornelli 2011-08-23 17:44 ` Marco Stornelli 2011-08-31 0:35 ` Dave Chinner 2011-08-31 0:35 ` Dave Chinner [not found] ` <CAGpXXZ+xjhadprkc_LiP3qUypLLkCxdeEmo8+K+6mOnBuNhmLg@mail.gmail.com> 2011-08-20 17:18 ` Greg Freemyer -- strict thread matches above, loose matches on Subject: below -- 2011-06-27 18:02 Josef Bacik 2011-06-27 21:04 ` Josef Bacik
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=1309275199-10801-1-git-send-email-josef@redhat.com \ --to=josef@redhat.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=viro@ZenIV.linux.org.uk \ --cc=xfs@oss.sgi.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.