Commit c8fe8f30 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro

cleanup may_open

Add a switch for the various i_mode fmt cases, and remove the comment
about writeability of devices nodes - that part is handled in
inode_permission and comment on (briefly) there.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b6520c81
...@@ -1486,24 +1486,22 @@ int may_open(struct path *path, int acc_mode, int flag) ...@@ -1486,24 +1486,22 @@ int may_open(struct path *path, int acc_mode, int flag)
if (!inode) if (!inode)
return -ENOENT; return -ENOENT;
if (S_ISLNK(inode->i_mode)) switch (inode->i_mode & S_IFMT) {
case S_IFLNK:
return -ELOOP; return -ELOOP;
case S_IFDIR:
if (S_ISDIR(inode->i_mode) && (acc_mode & MAY_WRITE)) if (acc_mode & MAY_WRITE)
return -EISDIR; return -EISDIR;
break;
/* case S_IFBLK:
* FIFO's, sockets and device files are special: they don't case S_IFCHR:
* actually live on the filesystem itself, and as such you
* can write to them even if the filesystem is read-only.
*/
if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
flag &= ~O_TRUNC;
} else if (S_ISBLK(inode->i_mode) || S_ISCHR(inode->i_mode)) {
if (path->mnt->mnt_flags & MNT_NODEV) if (path->mnt->mnt_flags & MNT_NODEV)
return -EACCES; return -EACCES;
/*FALLTHRU*/
case S_IFIFO:
case S_IFSOCK:
flag &= ~O_TRUNC; flag &= ~O_TRUNC;
break;
} }
error = inode_permission(inode, acc_mode); error = inode_permission(inode, acc_mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment