ext4: use EINVAL if not a regular file in ext4_fallocate()
PATCH 1/1 ext4: use EINVAL if not a regular file in ext4_fallocate()
From: Namjae Jeon <[email protected]>
Punch hole return EOPNOTSUPP about a non-REGULAR file also. So change EINVAL to be consistent with xfs. And move this check to the start of ext4_fallocate().
--- fs/ext4/extents.c | 9 +++------ fs/ext4/inode.c | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-)
fs/ext4/extents.c +3 -6
@@ -4741,9 +4741,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,trace_ext4_zero_range (inode, offset, len, mode); -if (!S_ISREG (inode->i_mode)) -return -EINVAL ; -/* * Write out all dirty pages to avoid race conditions * Then release them.
@@ -4888,6 +4885,9 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE |FALLOC_FL_ZERO_RANGE ))return -EOPNOTSUPP ; + +if (!S_ISREG (inode->i_mode)) +return -EINVAL ;if (mode &FALLOC_FL_PUNCH_HOLE )return ext4_punch_hole (inode, offset, len);
@@ -5403,9 +5403,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) len & (EXT4_BLOCK_SIZE(sb) - 1))return -EINVAL ; -if (!S_ISREG (inode->i_mode)) -return -EINVAL ; -if (EXT4_SB (inode->i_sb)->s_cluster_ratio >1 )return -EOPNOTSUPP ;
fs/ext4/inode.c +0 -2
@@ -3524,9 +3524,6 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)unsigned int credits;int ret =0 ; -if (!S_ISREG (inode->i_mode)) -return -EOPNOTSUPP ;
Quoted 5 lines · Namjae Jeon
From: Namjae Jeon <[email protected]>
Punch hole return EOPNOTSUPP about a non-REGULAR file also. So change EINVAL to be consistent with xfs. And move this check to the start of
ext4_fallocate().
IMHO, EOPNOTSUPP makes sense to me. From the man page of fallocate(2):
EOPNOTSUPP
The filesystem containing the file referred to by fd does not support this operation; or the mode is not supported by the filesystem containing the file referred to by fd.
Regards,
- Zheng
Quoted 63 lines
Signed-off-by Namjae Jeon <[email protected]>Signed-off-by Ashish Sangwan <[email protected]>--- fs/ext4/extents.c | 9 +++------ fs/ext4/inode.c | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-)fs/ext4/extents.c +3
-6@@ -4741,9 +4741,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,trace_ext4_zero_range (inode, offset, len, mode); -if (!S_ISREG (inode->i_mode)) -return -EINVAL ; -/* * Write out all dirty pages to avoid race conditions * Then release them. @@ -4888,6 +4885,9 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE |FALLOC_FL_ZERO_RANGE ))return -EOPNOTSUPP ; + +if (!S_ISREG (inode->i_mode)) +return -EINVAL ;if (mode &FALLOC_FL_PUNCH_HOLE )return ext4_punch_hole (inode, offset, len);@@ -5403,9 +5403,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) len & (EXT4_BLOCK_SIZE(sb) - 1))return -EINVAL ; -if (!S_ISREG (inode->i_mode)) -return -EINVAL ; -if (EXT4_SB (inode->i_sb)->s_cluster_ratio >1 )return -EOPNOTSUPP ;fs/ext4/inode.c +0
-3@@ -3524,9 +3524,6 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)unsigned int credits;int ret =0 ; -if (!S_ISREG (inode->i_mode)) -return -EOPNOTSUPP ; -trace_ext4_punch_hole (inode, offset, length,0 );/* Signature · 6 lines
1.7.11-rc0 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Namjae Jeon
Quoted 5 lines
From: Namjae Jeon <[email protected]>
Punch hole return EOPNOTSUPP about a non-REGULAR file also. So change EINVAL to be consistent with xfs. And move this check to the start of
ext4_fallocate().IMHO, EOPNOTSUPP makes sense to me. From the man page of fallocate(2):
Hi Zheng.
IMHO, EOPNOTSUPP should be used where the operation is not yet implemented but there is some chance that it could be implemented in future.
for example, it is ok for FS which has not yet implemented punch hole to return EOPNOTSUPP as they could implement it in future. but for the cases where it does not make sense to implement the operation, for example punching hole for non regular files does not make any sense, it is better to use EINVAL. On these lines, I agree that returning EOPNOTSUPP for collapse range in case of non-extent based file is ok, as it is plausible to implemet collapse range for non extent files in future.
Thanks for your opinion!
Quoted 10 lines
EOPNOTSUPP
The filesystem containing the file referred to by fd does not support this operation; or the mode is not supported by the filesystem containing the file referred to by fd.Regards,
- ZhengQuoted 1 line
Quoted 8 lines · Namjae Jeon
Quoted 5 lines
From: Namjae Jeon <[email protected]>
Punch hole return EOPNOTSUPP about a non-REGULAR file also. So change EINVAL to be consistent with xfs. And move this check to the start of
ext4_fallocate().IMHO, EOPNOTSUPP makes sense to me. From the man page of fallocate(2):
Hi Zheng.
IMHO, EOPNOTSUPP should be used where the operation is not yet implemented but there is some chance that it could be implemented in future.
for example, it is ok for FS which has not yet implemented punch hole to return EOPNOTSUPP as they could implement it in future. but for the cases where it does not make sense to implement the operation, for example punching hole for non regular files does not make any sense, it is better to use EINVAL. On these lines, I agree that returning EOPNOTSUPP for collapse range in case of non-extent based file is ok, as it is plausible to implemet collapse range for non extent files in future.
Thanks for your opinion!
Quoted 8 lines
EOPNOTSUPP
The filesystem containing the file referred to by fd does not support this operation; or the mode is not supported by the filesystem containing the file referred to by fd.Regards,
- Zheng
Quoted 17 lines · Zheng Liu
Date: Wed, 23 Apr 2014 14:08:23 +0800
From: Zheng Liu <[email protected]>
To: Namjae Jeon <[email protected]>
Cc: Theodore Ts'o <[email protected]>, linux-ext4 <[email protected]>,
Lukáš Czerner <[email protected]>
Subject: Re: [PATCH] ext4: use EINVAL if not a regular file in
ext4_fallocate()Quoted 5 lines · Namjae Jeon
From: Namjae Jeon <[email protected]>
Punch hole return EOPNOTSUPP about a non-REGULAR file also. So change EINVAL to be consistent with xfs. And move this check to the start of
ext4_fallocate().IMHO, EOPNOTSUPP makes sense to me. From the man page of fallocate(2):
Quoted 7 lines
EOPNOTSUPP
The filesystem containing the file referred to by fd does not support this operation; or the mode is not supported by the filesystem containing the file referred to by fd.Regards,
- Zheng
I actually have the same opinion. There has been a discussion on fsdevel-list and it seems that the decision was made to use EINVAL for this case.
However there was only one person actually arguing for using EINVA and that was Dave Chinner. Maybe we can discuss it a little bit more ?
-Lukas
Quoted 65 lines
Quoted 64 lines
Signed-off-by Namjae Jeon <[email protected]>Signed-off-by Ashish Sangwan <[email protected]>--- fs/ext4/extents.c | 9 +++------ fs/ext4/inode.c | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-)fs/ext4/extents.c +3
-6@@ -4741,9 +4741,6 @@ static long ext4_zero_range(struct file *file, loff_t offset,trace_ext4_zero_range (inode, offset, len, mode); -if (!S_ISREG (inode->i_mode)) -return -EINVAL ; -/* * Write out all dirty pages to avoid race conditions * Then release them. @@ -4888,6 +4885,9 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)if (mode & ~(FALLOC_FL_KEEP_SIZE |FALLOC_FL_PUNCH_HOLE |FALLOC_FL_COLLAPSE_RANGE |FALLOC_FL_ZERO_RANGE ))return -EOPNOTSUPP ; + +if (!S_ISREG (inode->i_mode)) +return -EINVAL ;if (mode &FALLOC_FL_PUNCH_HOLE )return ext4_punch_hole (inode, offset, len);@@ -5403,9 +5403,6 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) len & (EXT4_BLOCK_SIZE(sb) - 1))return -EINVAL ; -if (!S_ISREG (inode->i_mode)) -return -EINVAL ; -if (EXT4_SB (inode->i_sb)->s_cluster_ratio >1 )return -EOPNOTSUPP ;fs/ext4/inode.c +0
-3@@ -3524,9 +3524,6 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)unsigned int credits;int ret =0 ; -if (!S_ISREG (inode->i_mode)) -return -EOPNOTSUPP ; -trace_ext4_punch_hole (inode, offset, length,0 );/* Signature · 6 lines
1.7.11-rc0 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html