Merge branch 'next' into for-linus

Prepare first round of input updates for 3.20.

1 files changed, 37 insertions, 6 deletions

diff --git a/fs/open.c b/fs/open.c
index d6fd3acde134..813be037b412 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -222,7 +222,7 @@ SYSCALL_DEFINE2(ftruncate64, unsigned int, fd, loff_t, length)
 #endif /* BITS_PER_LONG == 32 */
 
 
-int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
+int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 {
         struct inode *inode = file_inode(file);
         long ret;
@@ -295,9 +295,21 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 
         sb_start_write(inode->i_sb);
         ret = file->f_op->fallocate(file, mode, offset, len);
+
+        /*
+         * Create inotify and fanotify events.
+         *
+         * To keep the logic simple always create events if fallocate succeeds.
+         * This implies that events are even created if the file size remains
+         * unchanged, e.g. when using flag FALLOC_FL_KEEP_SIZE.
+         */
+        if (ret == 0)
+                fsnotify_modify(file);
+
         sb_end_write(inode->i_sb);
         return ret;
 }
+EXPORT_SYMBOL_GPL(vfs_fallocate);
 
 SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
 {
@@ -305,7 +317,7 @@ SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)
         int error = -EBADF;
 
         if (f.file) {
-                error = do_fallocate(f.file, mode, offset, len);
+                error = vfs_fallocate(f.file, mode, offset, len);
                 fdput(f);
         }
         return error;
@@ -516,7 +528,7 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, umode_t, mode)
         int err = -EBADF;
 
         if (f.file) {
-                audit_inode(NULL, f.file->f_path.dentry, 0);
+                audit_file(f.file);
                 err = chmod_common(&f.file->f_path, mode);
                 fdput(f);
         }
@@ -642,7 +654,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
         error = mnt_want_write_file(f.file);
         if (error)
                 goto out_fput;
-        audit_inode(NULL, f.file->f_path.dentry, 0);
+        audit_file(f.file);
         error = chown_common(&f.file->f_path, user, group);
         mnt_drop_write_file(f.file);
 out_fput:
@@ -823,8 +835,7 @@ struct file *dentry_open(const struct path *path, int flags,
         f = get_empty_filp();
         if (!IS_ERR(f)) {
                 f->f_flags = flags;
-                f->f_path = *path;
-                error = do_dentry_open(f, NULL, cred);
+                error = vfs_open(path, f, cred);
                 if (!error) {
                         /* from now on we need fput() to dispose of f */
                         error = open_check_o_direct(f);
@@ -841,6 +852,26 @@ struct file *dentry_open(const struct path *path, int flags,
 }
 EXPORT_SYMBOL(dentry_open);
 
+/**
+ * vfs_open - open the file at the given path
+ * @path: path to open
+ * @filp: newly allocated file with f_flag initialized
+ * @cred: credentials to use
+ */
+int vfs_open(const struct path *path, struct file *filp,
+             const struct cred *cred)
+{
+        struct inode *inode = path->dentry->d_inode;
+
+        if (inode->i_op->dentry_open)
+                return inode->i_op->dentry_open(path->dentry, filp, cred);
+        else {
+                filp->f_path = *path;
+                return do_dentry_open(filp, NULL, cred);
+        }
+}
+EXPORT_SYMBOL(vfs_open);
+
 static inline int build_open_flags(int flags, umode_t mode, struct open_flags *op)
 {
         int lookup_flags = 0;