projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af43647
)
vfs: fix check for fallocate on active swapfile
author
Eric Biggers
<
[email protected]
>
Wed, 25 Jun 2014 04:45:08 +0000
(23:45 -0500)
committer
Al Viro
<
[email protected]
>
Fri, 1 Aug 2014 06:36:04 +0000
(
02:36
-0400)
Fix the broken check for calling sys_fallocate() on an active swapfile,
introduced by commit
0790b31b69374ddadefe
("fs: disallow all fallocate
operation on active swapfile").
Signed-off-by: Eric Biggers <
[email protected]
>
Signed-off-by: Al Viro <
[email protected]
>
fs/open.c
patch
|
blob
|
history
diff --git
a/fs/open.c
b/fs/open.c
index 36662d0362379698fcb5764fbb142337732b3919..d6fd3acde134d9669391cd064960790dea586042 100644
(file)
--- a/
fs/open.c
+++ b/
fs/open.c
@@
-263,11
+263,10
@@
int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
return -EPERM;
/*
- * We can not allow to do any fallocate operation on an active
- * swapfile
+ * We cannot allow any fallocate operation on an active swapfile
*/
if (IS_SWAPFILE(inode))
- ret
=
-ETXTBSY;
+ ret
urn
-ETXTBSY;
/*
* Revalidate the write permissions, in case security policy has