Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90959
b: refs/heads/master
c: 9ac9b84
h: refs/heads/master
i:
  90957: e2ad2ad
  90955: 973939c
  90951: 2cee23f
  90943: 873d820
v: v3
  • Loading branch information
Dave Hansen authored and Al Viro committed Apr 19, 2008
1 parent 48388a2 commit f220275
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2af482a7edfb8810539cacc2fdd8242611ca43bb
refs/heads/master: 9ac9b8474c39c3ae2c2b37d8e1f08db8a9146124
14 changes: 8 additions & 6 deletions trunk/fs/open.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,21 +244,21 @@ static long do_sys_truncate(const char __user * path, loff_t length)
if (!S_ISREG(inode->i_mode))
goto dput_and_out;

error = vfs_permission(&nd, MAY_WRITE);
error = mnt_want_write(nd.path.mnt);
if (error)
goto dput_and_out;

error = -EROFS;
if (IS_RDONLY(inode))
goto dput_and_out;
error = vfs_permission(&nd, MAY_WRITE);
if (error)
goto mnt_drop_write_and_out;

error = -EPERM;
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
goto dput_and_out;
goto mnt_drop_write_and_out;

error = get_write_access(inode);
if (error)
goto dput_and_out;
goto mnt_drop_write_and_out;

/*
* Make sure that there are no leases. get_write_access() protects
Expand All @@ -276,6 +276,8 @@ static long do_sys_truncate(const char __user * path, loff_t length)

put_write_and_out:
put_write_access(inode);
mnt_drop_write_and_out:
mnt_drop_write(nd.path.mnt);
dput_and_out:
path_put(&nd.path);
out:
Expand Down

0 comments on commit f220275

Please sign in to comment.