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

Pull more vfs updates from Al Viro:
 "In this pile:

   - autofs-namespace series
   - dedupe stuff
   - more struct path constification"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (40 commits)
  ocfs2: implement the VFS clone_range, copy_range, and dedupe_range features
  ocfs2: charge quota for reflinked blocks
  ocfs2: fix bad pointer cast
  ocfs2: always unlock when completing dio writes
  ocfs2: don't eat io errors during _dio_end_io_write
  ocfs2: budget for extent tree splits when adding refcount flag
  ocfs2: prohibit refcounted swapfiles
  ocfs2: add newlines to some error messages
  ocfs2: convert inode refcount test to a helper
  simple_write_end(): don't zero in short copy into uptodate
  exofs: don't mess with simple_write_{begin,end}
  9p: saner ->write_end() on failing copy into non-uptodate page
  fix gfs2_stuffed_write_end() on short copies
  fix ceph_write_end()
  nfs_write_end(): fix handling of short copies
  vfs: refactor clone/dedupe_file_range common functions
  fs: try to clone files first in vfs_copy_file_range
  vfs: misc struct path constification
  namespace.c: constify struct path passed to a bunch of primitives
  quota: constify struct path in quota_on
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index 2d7bdcb996b6..f79e4658433d 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -471,10 +471,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
                                     struct inode *to_tell,
                                     struct fsnotify_mark *inode_mark,
                                     struct fsnotify_mark *vfsmount_mark,
-                                    u32 mask, void *data, int data_type,
+                                    u32 mask, const void *data, int data_type,
                                     const unsigned char *dname, u32 cookie)
 {
-        struct inode *inode;
+        const struct inode *inode;
         struct audit_parent *parent;
 
         parent = container_of(inode_mark, struct audit_parent, mark);
@@ -483,10 +483,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
 
         switch (data_type) {
         case (FSNOTIFY_EVENT_PATH):
-                inode = d_backing_inode(((struct path *)data)->dentry);
+                inode = d_backing_inode(((const struct path *)data)->dentry);
                 break;
         case (FSNOTIFY_EVENT_INODE):
-                inode = (struct inode *)data;
+                inode = (const struct inode *)data;
                 break;
         default:
                 BUG();