Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  FUSE: Notifying the kernel of deletion.
  fuse: support ioctl on directories
  fuse: Use kcalloc instead of kzalloc to allocate array
  fuse: llseek optimize SEEK_CUR and SEEK_SET

1 files changed, 56 insertions, 2 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 5ddd6ea8f839..206632887bb4 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -868,7 +868,7 @@ int fuse_update_attributes(struct inode *inode, struct kstat *stat,
 }
 
 int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid,
-                             struct qstr *name)
+                             u64 child_nodeid, struct qstr *name)
 {
         int err = -ENOTDIR;
         struct inode *parent;
@@ -895,8 +895,36 @@ int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid,
 
         fuse_invalidate_attr(parent);
         fuse_invalidate_entry(entry);
+
+        if (child_nodeid != 0 && entry->d_inode) {
+                mutex_lock(&entry->d_inode->i_mutex);
+                if (get_node_id(entry->d_inode) != child_nodeid) {
+                        err = -ENOENT;
+                        goto badentry;
+                }
+                if (d_mountpoint(entry)) {
+                        err = -EBUSY;
+                        goto badentry;
+                }
+                if (S_ISDIR(entry->d_inode->i_mode)) {
+                        shrink_dcache_parent(entry);
+                        if (!simple_empty(entry)) {
+                                err = -ENOTEMPTY;
+                                goto badentry;
+                        }
+                        entry->d_inode->i_flags |= S_DEAD;
+                }
+                dont_mount(entry);
+                clear_nlink(entry->d_inode);
+                err = 0;
+ badentry:
+                mutex_unlock(&entry->d_inode->i_mutex);
+                if (!err)
+                        d_delete(entry);
+        } else {
+                err = 0;
+        }
         dput(entry);
-        err = 0;
 
  unlock:
         mutex_unlock(&parent->i_mutex);
@@ -1182,6 +1210,30 @@ static int fuse_dir_fsync(struct file *file, loff_t start, loff_t end,
         return fuse_fsync_common(file, start, end, datasync, 1);
 }
 
+static long fuse_dir_ioctl(struct file *file, unsigned int cmd,
+                            unsigned long arg)
+{
+        struct fuse_conn *fc = get_fuse_conn(file->f_mapping->host);
+
+        /* FUSE_IOCTL_DIR only supported for API version >= 7.18 */
+        if (fc->minor < 18)
+                return -ENOTTY;
+
+        return fuse_ioctl_common(file, cmd, arg, FUSE_IOCTL_DIR);
+}
+
+static long fuse_dir_compat_ioctl(struct file *file, unsigned int cmd,
+                                   unsigned long arg)
+{
+        struct fuse_conn *fc = get_fuse_conn(file->f_mapping->host);
+
+        if (fc->minor < 18)
+                return -ENOTTY;
+
+        return fuse_ioctl_common(file, cmd, arg,
+                                 FUSE_IOCTL_COMPAT | FUSE_IOCTL_DIR);
+}
+
 static bool update_mtime(unsigned ivalid)
 {
         /* Always update if mtime is explicitly set  */
@@ -1596,6 +1648,8 @@ static const struct file_operations fuse_dir_operations = {
         .open           = fuse_dir_open,
         .release        = fuse_dir_release,
         .fsync          = fuse_dir_fsync,
+        .unlocked_ioctl = fuse_dir_ioctl,
+        .compat_ioctl   = fuse_dir_compat_ioctl,
 };
 
 static const struct inode_operations fuse_common_inode_operations = {