diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
| commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
| tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /fs/jfs/ioctl.c | |
| parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jfs/ioctl.c')
| -rw-r--r-- | fs/jfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/ioctl.c b/fs/jfs/ioctl.c index fe063af6fd2f..3c8663bea98c 100644 --- a/fs/jfs/ioctl.c +++ b/fs/jfs/ioctl.c | |||
| @@ -69,7 +69,7 @@ int jfs_ioctl(struct inode * inode, struct file * filp, unsigned int cmd, | |||
| 69 | if (IS_RDONLY(inode)) | 69 | if (IS_RDONLY(inode)) |
| 70 | return -EROFS; | 70 | return -EROFS; |
| 71 | 71 | ||
| 72 | if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER)) | 72 | if (!is_owner_or_cap(inode)) |
| 73 | return -EACCES; | 73 | return -EACCES; |
| 74 | 74 | ||
| 75 | if (get_user(flags, (int __user *) arg)) | 75 | if (get_user(flags, (int __user *) arg)) |