Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / fs / ocfs2 / quota.h

diff --git a/fs/ocfs2/quota.h b/fs/ocfs2/quota.h
index 04872b45b99048e81e17c8bbb7e81ee955a5a697..7365e2e08706ef6ea07b5f034310f5fec6fd9e4a 100644 (file)
--- a/fs/ocfs2/quota.h
+++ b/fs/ocfs2/quota.h
@@ -107,8 +107,8 @@ static inline int ocfs2_global_release_dquot(struct dquot *dquot)
 
 int ocfs2_lock_global_qf(struct ocfs2_mem_dqinfo *oinfo, int ex);
 void ocfs2_unlock_global_qf(struct ocfs2_mem_dqinfo *oinfo, int ex);
-struct buffer_head *ocfs2_read_quota_block(struct inode *inode,
-                                          int block, int *err);
+int ocfs2_read_quota_block(struct inode *inode, u64 v_block,
+                          struct buffer_head **bh);
 
 extern struct dquot_operations ocfs2_quota_operations;
 extern struct quota_format_type ocfs2_quota_format;