Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes

[~andy/linux] / fs / ceph / super.h

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index c01aa646b40739530e50ca8571878788a982ed0e..88fcaa21b801a8c10ba2be23c41967b95ddfcef6 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -667,7 +667,7 @@ extern void ceph_queue_invalidate(struct inode *inode);
 extern void ceph_queue_writeback(struct inode *inode);
 
 extern int ceph_do_getattr(struct inode *inode, int mask);
-extern int ceph_permission(struct inode *inode, int mask);
+extern int ceph_permission(struct inode *inode, int mask, unsigned int flags);
 extern int ceph_setattr(struct dentry *dentry, struct iattr *attr);
 extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,
                        struct kstat *stat);