Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[deliverable/linux.git] / fs / ocfs2 / file.h

diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h
index a5ea33b2406072d43cc61d637ba6121652497d42..2c4460fced52b8aa1190a351a20561221ddf8ed3 100644 (file)
--- a/fs/ocfs2/file.h
+++ b/fs/ocfs2/file.h
@@ -26,10 +26,10 @@
 #ifndef OCFS2_FILE_H
 #define OCFS2_FILE_H
 
-extern struct file_operations ocfs2_fops;
-extern struct file_operations ocfs2_dops;
-extern struct inode_operations ocfs2_file_iops;
-extern struct inode_operations ocfs2_special_file_iops;
+extern const struct file_operations ocfs2_fops;
+extern const struct file_operations ocfs2_dops;
+extern const struct inode_operations ocfs2_file_iops;
+extern const struct inode_operations ocfs2_special_file_iops;
 struct ocfs2_alloc_context;
 
 enum ocfs2_alloc_restarted {
@@ -39,19 +39,31 @@ enum ocfs2_alloc_restarted {
 };
 int ocfs2_do_extend_allocation(struct ocfs2_super *osb,
                               struct inode *inode,
+                              u32 *cluster_start,
                               u32 clusters_to_add,
                               struct buffer_head *fe_bh,
-                              struct ocfs2_journal_handle *handle,
+                              handle_t *handle,
                               struct ocfs2_alloc_context *data_ac,
                               struct ocfs2_alloc_context *meta_ac,
                               enum ocfs2_alloc_restarted *reason);
+int ocfs2_lock_allocators(struct inode *inode, struct ocfs2_dinode *di,
+                         u32 clusters_to_add,
+                         struct ocfs2_alloc_context **data_ac,
+                         struct ocfs2_alloc_context **meta_ac);
 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_set_inode_size(struct ocfs2_journal_handle *handle,
+int ocfs2_set_inode_size(handle_t *handle,
                         struct inode *inode,
                         struct buffer_head *fe_bh,
                         u64 new_i_size);
 
+int ocfs2_should_update_atime(struct inode *inode,
+                             struct vfsmount *vfsmnt);
+int ocfs2_update_inode_atime(struct inode *inode,
+                            struct buffer_head *bh);
+
 #endif /* OCFS2_FILE_H */