diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:46:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 16:46:59 +0100 |
| commit | 2011a067281565494494aee194ca5081e52d6c3f (patch) | |
| tree | e0b21ad43e6eeb0c67945026be71d1278c93c695 /fs/hfs | |
| parent | 63fb70859f987f2b3b8028fa467fd63336315e9c (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/doc
Diffstat (limited to 'fs/hfs')
| -rw-r--r-- | fs/hfs/inode.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 7e19835efa2..c69b7ac75bf 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -511,13 +511,6 @@ void hfs_clear_inode(struct inode *inode) } } -static int hfs_permission(struct inode *inode, int mask) -{ - if (S_ISREG(inode->i_mode) && mask & MAY_EXEC) - return 0; - return generic_permission(inode, mask, NULL); -} - static int hfs_file_open(struct inode *inode, struct file *file) { if (HFS_IS_RSRC(inode)) @@ -616,7 +609,6 @@ static const struct inode_operations hfs_file_inode_operations = { .lookup = hfs_file_lookup, .truncate = hfs_file_truncate, .setattr = hfs_inode_setattr, - .permission = hfs_permission, .setxattr = hfs_setxattr, .getxattr = hfs_getxattr, .listxattr = hfs_listxattr, |