Skip to content

Commit 783904f

Browse files
jtlaytonbrauner
authored andcommitted
mqueue: convert to ctime accessor functions
In later patches, we're going to change how the inode's ctime field is used. Switch to using accessor functions instead of raw accesses of inode->i_ctime. Signed-off-by: Jeff Layton <[email protected]> Reviewed-by: Jan Kara <[email protected]> Message-Id: <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent e359147 commit 783904f

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

ipc/mqueue.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
302302
inode->i_mode = mode;
303303
inode->i_uid = current_fsuid();
304304
inode->i_gid = current_fsgid();
305-
inode->i_mtime = inode->i_ctime = inode->i_atime = current_time(inode);
305+
inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
306306

307307
if (S_ISREG(mode)) {
308308
struct mqueue_inode_info *info;
@@ -596,7 +596,7 @@ static int mqueue_create_attr(struct dentry *dentry, umode_t mode, void *arg)
596596

597597
put_ipc_ns(ipc_ns);
598598
dir->i_size += DIRENT_SIZE;
599-
dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
599+
dir->i_mtime = dir->i_atime = inode_set_ctime_current(dir);
600600

601601
d_instantiate(dentry, inode);
602602
dget(dentry);
@@ -618,7 +618,7 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
618618
{
619619
struct inode *inode = d_inode(dentry);
620620

621-
dir->i_ctime = dir->i_mtime = dir->i_atime = current_time(dir);
621+
dir->i_mtime = dir->i_atime = inode_set_ctime_current(dir);
622622
dir->i_size -= DIRENT_SIZE;
623623
drop_nlink(inode);
624624
dput(dentry);
@@ -635,7 +635,8 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
635635
static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
636636
size_t count, loff_t *off)
637637
{
638-
struct mqueue_inode_info *info = MQUEUE_I(file_inode(filp));
638+
struct inode *inode = file_inode(filp);
639+
struct mqueue_inode_info *info = MQUEUE_I(inode);
639640
char buffer[FILENT_SIZE];
640641
ssize_t ret;
641642

@@ -656,7 +657,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
656657
if (ret <= 0)
657658
return ret;
658659

659-
file_inode(filp)->i_atime = file_inode(filp)->i_ctime = current_time(file_inode(filp));
660+
inode->i_atime = inode_set_ctime_current(inode);
660661
return ret;
661662
}
662663

@@ -1162,8 +1163,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
11621163
goto out_unlock;
11631164
__do_notify(info);
11641165
}
1165-
inode->i_atime = inode->i_mtime = inode->i_ctime =
1166-
current_time(inode);
1166+
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
11671167
}
11681168
out_unlock:
11691169
spin_unlock(&info->lock);
@@ -1257,8 +1257,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
12571257

12581258
msg_ptr = msg_get(info);
12591259

1260-
inode->i_atime = inode->i_mtime = inode->i_ctime =
1261-
current_time(inode);
1260+
inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
12621261

12631262
/* There is now free space in queue. */
12641263
pipelined_receive(&wake_q, info);
@@ -1396,7 +1395,7 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
13961395
if (notification == NULL) {
13971396
if (info->notify_owner == task_tgid(current)) {
13981397
remove_notification(info);
1399-
inode->i_atime = inode->i_ctime = current_time(inode);
1398+
inode->i_atime = inode_set_ctime_current(inode);
14001399
}
14011400
} else if (info->notify_owner != NULL) {
14021401
ret = -EBUSY;
@@ -1422,7 +1421,7 @@ static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
14221421

14231422
info->notify_owner = get_pid(task_tgid(current));
14241423
info->notify_user_ns = get_user_ns(current_user_ns());
1425-
inode->i_atime = inode->i_ctime = current_time(inode);
1424+
inode->i_atime = inode_set_ctime_current(inode);
14261425
}
14271426
spin_unlock(&info->lock);
14281427
out_fput:
@@ -1485,7 +1484,7 @@ static int do_mq_getsetattr(int mqdes, struct mq_attr *new, struct mq_attr *old)
14851484
f.file->f_flags &= ~O_NONBLOCK;
14861485
spin_unlock(&f.file->f_lock);
14871486

1488-
inode->i_atime = inode->i_ctime = current_time(inode);
1487+
inode->i_atime = inode_set_ctime_current(inode);
14891488
}
14901489

14911490
spin_unlock(&info->lock);

0 commit comments

Comments
 (0)