projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
ext2
/
ioctl.c
diff --git
a/fs/ext2/ioctl.c
b/fs/ext2/ioctl.c
index
5d46c09
..
9d61742
100644
(file)
--- a/
fs/ext2/ioctl.c
+++ b/
fs/ext2/ioctl.c
@@
-51,10
+51,10
@@
long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
flags = ext2_mask_flags(inode->i_mode, flags);
flags = ext2_mask_flags(inode->i_mode, flags);
-
mutex_lock(&inode->i_mutex
);
+
inode_lock(inode
);
/* Is it quota file? Do not allow user to mess with it */
if (IS_NOQUOTA(inode)) {
/* Is it quota file? Do not allow user to mess with it */
if (IS_NOQUOTA(inode)) {
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
ret = -EPERM;
goto setflags_out;
}
ret = -EPERM;
goto setflags_out;
}
@@
-68,7
+68,7
@@
long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
*/
if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
if (!capable(CAP_LINUX_IMMUTABLE)) {
*/
if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) {
if (!capable(CAP_LINUX_IMMUTABLE)) {
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
ret = -EPERM;
goto setflags_out;
}
ret = -EPERM;
goto setflags_out;
}
@@
-79,8
+79,8
@@
long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
ei->i_flags = flags;
ext2_set_inode_flags(inode);
ei->i_flags = flags;
ext2_set_inode_flags(inode);
- inode->i_ctime =
CURRENT_TIME_SEC
;
-
mutex_unlock(&inode->i_mutex
);
+ inode->i_ctime =
current_time(inode)
;
+
inode_unlock(inode
);
mark_inode_dirty(inode);
setflags_out:
mark_inode_dirty(inode);
setflags_out:
@@
-102,10
+102,10
@@
setflags_out:
goto setversion_out;
}
goto setversion_out;
}
-
mutex_lock(&inode->i_mutex
);
- inode->i_ctime =
CURRENT_TIME_SEC
;
+
inode_lock(inode
);
+ inode->i_ctime =
current_time(inode)
;
inode->i_generation = generation;
inode->i_generation = generation;
-
mutex_unlock(&inode->i_mutex
);
+
inode_unlock(inode
);
mark_inode_dirty(inode);
setversion_out:
mark_inode_dirty(inode);
setversion_out: