Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus

[linux-2.6-microblaze.git] / fs / affs / affs.h

diff --git a/fs/affs/affs.h b/fs/affs/affs.h
index a755bef..bfa89e1 100644 (file)
--- a/fs/affs/affs.h
+++ b/fs/affs/affs.h
@@ -167,27 +167,33 @@ extern const struct export_operations affs_export_ops;
 extern int     affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len);
 extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, unsigned int);
 extern int     affs_unlink(struct inode *dir, struct dentry *dentry);
-extern int     affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool);
-extern int     affs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
+extern int     affs_create(struct user_namespace *mnt_userns, struct inode *dir,
+                       struct dentry *dentry, umode_t mode, bool);
+extern int     affs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
+                       struct dentry *dentry, umode_t mode);
 extern int     affs_rmdir(struct inode *dir, struct dentry *dentry);
 extern int     affs_link(struct dentry *olddentry, struct inode *dir,
                          struct dentry *dentry);
-extern int     affs_symlink(struct inode *dir, struct dentry *dentry,
-                            const char *symname);
-extern int     affs_rename2(struct inode *old_dir, struct dentry *old_dentry,
-                           struct inode *new_dir, struct dentry *new_dentry,
-                           unsigned int flags);
+extern int     affs_symlink(struct user_namespace *mnt_userns,
+                       struct inode *dir, struct dentry *dentry,
+                       const char *symname);
+extern int     affs_rename2(struct user_namespace *mnt_userns,
+                       struct inode *old_dir, struct dentry *old_dentry,
+                       struct inode *new_dir, struct dentry *new_dentry,
+                       unsigned int flags);
 
 /* inode.c */
 
 extern struct inode            *affs_new_inode(struct inode *dir);
-extern int                      affs_notify_change(struct dentry *dentry, struct iattr *attr);
+extern int                      affs_notify_change(struct user_namespace *mnt_userns,
+                                       struct dentry *dentry, struct iattr *attr);
 extern void                     affs_evict_inode(struct inode *inode);
 extern struct inode            *affs_iget(struct super_block *sb,
                                        unsigned long ino);
 extern int                      affs_write_inode(struct inode *inode,
                                        struct writeback_control *wbc);
-extern int                      affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s32 type);
+extern int                      affs_add_entry(struct inode *dir, struct inode *inode,
+                                       struct dentry *dentry, s32 type);
 
 /* file.c */