MIPS: RBTX4927: More explicit initialization

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / file.h

diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h
index 066f14add3a8c2f06ad465b2d9b81011ffaf0e4b..1e27b4d017ea49401ec43445a29d62bcd6b219ce 100644 (file)
--- a/fs/ocfs2/file.h
+++ b/fs/ocfs2/file.h
@@ -32,6 +32,12 @@ extern const struct inode_operations ocfs2_file_iops;
 extern const struct inode_operations ocfs2_special_file_iops;
 struct ocfs2_alloc_context;
 
+struct ocfs2_file_private {
+       struct file             *fp_file;
+       struct mutex            fp_mutex;
+       struct ocfs2_lock_res   fp_flock;
+};
+
 enum ocfs2_alloc_restarted {
        RESTART_NONE = 0,
        RESTART_TRANS,
@@ -56,8 +62,7 @@ int ocfs2_lock_allocators(struct inode *inode, struct ocfs2_dinode *di,
 int ocfs2_setattr(struct dentry *dentry, struct iattr *attr);
 int ocfs2_getattr(struct vfsmount *mnt, struct dentry *dentry,
                  struct kstat *stat);
-int ocfs2_permission(struct inode *inode, int mask,
-                    struct nameidata *nd);
+int ocfs2_permission(struct inode *inode, int mask);
 
 int ocfs2_should_update_atime(struct inode *inode,
                              struct vfsmount *vfsmnt);