diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-11-09 00:35:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:55:59 -0500 |
| commit | 8c744fb83da0771afa04695028e3550b798dad90 (patch) | |
| tree | 670896a1c2594965099853a6c992907abb3a886f /drivers | |
| parent | e4543eddfd3bf3e0d625841377fa695a519edfd4 (diff) | |
[PATCH] add a file_permission helper
A few more callers of permission() just want to check for a different access
pattern on an already open file. This patch adds a wrapper for permission()
that takes a file in preparation of per-mount read-only support and to clean
up the callers a little. The helper is not intended for new code, everything
without the interface set in stone should use vfs_permission()
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/floppy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index dd1935d55424..28002de783b6 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -3776,8 +3776,7 @@ static int floppy_open(struct inode *inode, struct file *filp) | |||
| 3776 | /* Allow ioctls if we have write-permissions even if read-only open. | 3776 | /* Allow ioctls if we have write-permissions even if read-only open. |
| 3777 | * Needed so that programs such as fdrawcmd still can work on write | 3777 | * Needed so that programs such as fdrawcmd still can work on write |
| 3778 | * protected disks */ | 3778 | * protected disks */ |
| 3779 | if (filp->f_mode & 2 | 3779 | if ((filp->f_mode & FMODE_WRITE) || !file_permission(filp, MAY_WRITE)) |
| 3780 | || permission(filp->f_dentry->d_inode, 2, NULL) == 0) | ||
| 3781 | filp->private_data = (void *)8; | 3780 | filp->private_data = (void *)8; |
| 3782 | 3781 | ||
| 3783 | if (UFDCS->rawcmd == 1) | 3782 | if (UFDCS->rawcmd == 1) |