From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH] Intermezzo should call vfs_permission Date: Fri, 31 Oct 2003 13:20:24 +0000 Sender: linux-fsdevel-owner@vger.kernel.org Message-ID: <20031031132024.GS25237@parcelfarce.linux.theplanet.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-fsdevel@vger.kernel.org Return-path: Received: from parcelfarce.linux.theplanet.co.uk ([195.92.249.252]:38865 "EHLO www.linux.org.uk") by vger.kernel.org with ESMTP id S263273AbTJaNU0 (ORCPT ); Fri, 31 Oct 2003 08:20:26 -0500 To: intermezzo-devel@lists.sf.net Content-Disposition: inline List-Id: linux-fsdevel.vger.kernel.org This patch fixes some extremely naughty behaviour by intermezzo where it overrides a member of an inode's i_op -- which is probably shared between all inodes of that filesystem type! It turns out that the intended behaviour is accomplished equally well by just calling vfs_permission(). Index: fs/intermezzo/dir.c =================================================================== RCS file: /var/cvs/linux-2.6/fs/intermezzo/dir.c,v retrieving revision 1.12 diff -u -p -r1.12 dir.c --- a/fs/intermezzo/dir.c 8 Oct 2003 20:52:46 -0000 1.12 +++ b/fs/intermezzo/dir.c 31 Oct 2003 03:10:01 -0000 @@ -835,10 +835,9 @@ int presto_permission(struct inode *inod { unsigned short mode = inode->i_mode; struct presto_cache *cache; - int rc; ENTRY; - if ( presto_can_ilookup() && !(mask & S_IWOTH)) { + if (presto_can_ilookup() && !(mask & S_IWOTH)) { CDEBUG(D_CACHE, "ilookup on %ld OK\n", inode->i_ino); EXIT; return 0; @@ -861,18 +860,8 @@ int presto_permission(struct inode *inod } } - /* The cache filesystem doesn't have its own permission function, - * but we don't want to duplicate the VFS code here. In order - * to avoid looping from permission calling this function again, - * we temporarily override the permission operation while we call - * the VFS permission function. - */ - inode->i_op->permission = NULL; - rc = permission(inode, mask, nd); - inode->i_op->permission = &presto_permission; - EXIT; - return rc; + return vfs_permission(inode, mask); } -- "It's not Hollywood. War is real, war is primarily not about defeat or victory, it is about death. I've seen thousands and thousands of dead bodies. Do you think I want to have an academic debate on this subject?" -- Robert Fisk