Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: extent macros cleanup
  Fix compilation with EXT_DEBUG, also fix leXX_to_cpu conversions.
  ext4: remove extra IS_RDONLY() check
  ext4: Use is_power_of_2()
  Use zero_user_page() in ext4 where possible
  ext4: Remove 65000 subdirectory limit
  ext4: Expand extra_inodes space per the s_{want,min}_extra_isize fields 
  ext4: Add nanosecond timestamps
  jbd2: Move jbd2-debug file to debugfs
  jbd2: Fix CONFIG_JBD_DEBUG ifdef to be CONFIG_JBD2_DEBUG
  ext4: Set the journal JBD2_FEATURE_INCOMPAT_64BIT on large devices
  ext4: Make extents code sanely handle on-disk corruption
  ext4: copy i_flags to inode flags on write
  ext4: Enable extents by default
  Change on-disk format to support 2^15 uninitialized extents
  write support for preallocated blocks
  fallocate support in ext4
  sys_fallocate() implementation on i386, x86_64 and powerpc

1 files changed, 59 insertions, 0 deletions

diff --git a/fs/open.c b/fs/open.c
index be6a457f4226..a6b054edacba 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -26,6 +26,7 @@
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
+#include <linux/falloc.h>
 
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
@@ -352,6 +353,64 @@ asmlinkage long sys_ftruncate64(unsigned int fd, loff_t length)
 }
 #endif
 
+asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len)
+{
+        struct file *file;
+        struct inode *inode;
+        long ret = -EINVAL;
+
+        if (offset < 0 || len <= 0)
+                goto out;
+
+        /* Return error if mode is not supported */
+        ret = -EOPNOTSUPP;
+        if (mode && !(mode & FALLOC_FL_KEEP_SIZE))
+                goto out;
+
+        ret = -EBADF;
+        file = fget(fd);
+        if (!file)
+                goto out;
+        if (!(file->f_mode & FMODE_WRITE))
+                goto out_fput;
+        /*
+         * Revalidate the write permissions, in case security policy has
+         * changed since the files were opened.
+         */
+        ret = security_file_permission(file, MAY_WRITE);
+        if (ret)
+                goto out_fput;
+
+        inode = file->f_path.dentry->d_inode;
+
+        ret = -ESPIPE;
+        if (S_ISFIFO(inode->i_mode))
+                goto out_fput;
+
+        ret = -ENODEV;
+        /*
+         * Let individual file system decide if it supports preallocation
+         * for directories or not.
+         */
+        if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
+                goto out_fput;
+
+        ret = -EFBIG;
+        /* Check for wrap through zero too */
+        if (((offset + len) > inode->i_sb->s_maxbytes) || ((offset + len) < 0))
+                goto out_fput;
+
+        if (inode->i_op && inode->i_op->fallocate)
+                ret = inode->i_op->fallocate(inode, mode, offset, len);
+        else
+                ret = -ENOSYS;
+
+out_fput:
+        fput(file);
+out:
+        return ret;
+}
+
 /*
  * access() needs to use the real uid/gid, not the effective uid/gid.
  * We do this by temporarily clearing all FS-related capabilities and