Skip to content

Commit

Permalink
cleanup may_open
Browse files Browse the repository at this point in the history
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Christoph Hellwig authored and Al Viro committed Mar 27, 2009
1 parent b6520c8 commit c8fe8f3
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1486,24 +1486,22 @@ int may_open(struct path *path, int acc_mode, int flag)
if (!inode)
return -ENOENT;

if (S_ISLNK(inode->i_mode))
switch (inode->i_mode & S_IFMT) {
case S_IFLNK:
return -ELOOP;

if (S_ISDIR(inode->i_mode) && (acc_mode & MAY_WRITE))
return -EISDIR;

/*
* FIFO's, sockets and device files are special: they don't
* 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)) {
case S_IFDIR:
if (acc_mode & MAY_WRITE)
return -EISDIR;
break;
case S_IFBLK:
case S_IFCHR:
if (path->mnt->mnt_flags & MNT_NODEV)
return -EACCES;

/*FALLTHRU*/
case S_IFIFO:
case S_IFSOCK:
flag &= ~O_TRUNC;
break;
}

error = inode_permission(inode, acc_mode);
Expand Down

0 comments on commit c8fe8f3

Please sign in to comment.