[PATCH] fix reiser4 compilation for ->permission changes

Christoph Hellwig
2004-09-13T14:02:35Z

remove reiser4 permission. It only ends up calling generic_permission
with no additional bits so it's completely unessecary.

--- reiser4/fs/reiser4/inode_ops.c~ 2004-09-13 16:01:33.692057520 +0200
+++ reiser4/fs/reiser4/inode_ops.c 2004-09-13 16:01:48.759766880 +0200
@@ -64,7 +64,6 @@
static int reiser4_readlink(struct dentry *, char *, int);
static int reiser4_follow_link(struct dentry *, struct nameidata *);
static void reiser4_truncate(struct inode *);
-static int reiser4_permission(struct inode *, int, struct nameidata *);
static int reiser4_setattr(struct dentry *, struct iattr *);
static int reiser4_getattr(struct vfsmount *mnt, struct dentry *, struct kstat *);

@@ -394,22 +393,6 @@
reiser4_exit_context(&ctx);
}

-/* ->permission() method in reiser4_inode_operations. */
-static int
-reiser4_permission(struct inode *inode /* object */ ,
- int mask, /* mode bits to check permissions
- * for */
- struct nameidata *nameidata)
-{
- /* reiser4_context creation/destruction removed from here,
- because permission checks currently don't require this.
-
- Permission plugin have to create context itself if necessary. */
- assert("nikita-1687", inode != NULL);
-
- return perm_chk(inode, mask, inode, mask);
-}
-
/* common part of both unlink and rmdir. */
static int
unlink_file(struct inode *parent /* parent directory */ ,
@@ -615,7 +598,6 @@
.readlink = NULL,
.follow_link = NULL,
.truncate = reiser4_truncate, /* d */
- .permission = reiser4_permission, /* d */
.setattr = reiser4_setattr, /* d */
.getattr = reiser4_getattr, /* d */
};