diff options
| author | Fabian Frederick <fabf@skynet.be> | 2017-01-06 21:53:54 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-01-10 11:49:01 +0100 |
| commit | 7ed0fbd7e3187cc24a47565afcf7fc1f46684755 (patch) | |
| tree | f29e207700731eab0037d5cec38a1177263e175d /fs/udf | |
| parent | d50c4dd5279b6a2b3ae2c66435ec5c9825b7cff3 (diff) | |
| download | linux-stable-7ed0fbd7e3187cc24a47565afcf7fc1f46684755.tar.gz linux-stable-7ed0fbd7e3187cc24a47565afcf7fc1f46684755.tar.bz2 linux-stable-7ed0fbd7e3187cc24a47565afcf7fc1f46684755.zip | |
udf: Factor out trimming of crtime
Factor out trimming of crtime field.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/inode.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index ea8f544df5b8..8cc5dbccebc7 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1612,6 +1612,14 @@ static int udf_sync_inode(struct inode *inode) return udf_update_inode(inode, 1); } +static void udf_adjust_time(struct udf_inode_info *iinfo, struct timespec time) +{ + if (iinfo->i_crtime.tv_sec > time.tv_sec || + (iinfo->i_crtime.tv_sec == time.tv_sec && + iinfo->i_crtime.tv_nsec > time.tv_nsec)) + iinfo->i_crtime = time; +} + static int udf_update_inode(struct inode *inode, int do_sync) { struct buffer_head *bh = NULL; @@ -1738,20 +1746,9 @@ static int udf_update_inode(struct inode *inode, int do_sync) efe->objectSize = cpu_to_le64(inode->i_size); efe->logicalBlocksRecorded = cpu_to_le64(lb_recorded); - if (iinfo->i_crtime.tv_sec > inode->i_atime.tv_sec || - (iinfo->i_crtime.tv_sec == inode->i_atime.tv_sec && - iinfo->i_crtime.tv_nsec > inode->i_atime.tv_nsec)) - iinfo->i_crtime = inode->i_atime; - - if (iinfo->i_crtime.tv_sec > inode->i_mtime.tv_sec || - (iinfo->i_crtime.tv_sec == inode->i_mtime.tv_sec && - iinfo->i_crtime.tv_nsec > inode->i_mtime.tv_nsec)) - iinfo->i_crtime = inode->i_mtime; - - if (iinfo->i_crtime.tv_sec > inode->i_ctime.tv_sec || - (iinfo->i_crtime.tv_sec == inode->i_ctime.tv_sec && - iinfo->i_crtime.tv_nsec > inode->i_ctime.tv_nsec)) - iinfo->i_crtime = inode->i_ctime; + udf_adjust_time(iinfo, inode->i_atime); + udf_adjust_time(iinfo, inode->i_mtime); + udf_adjust_time(iinfo, inode->i_ctime); udf_time_to_disk_stamp(&efe->accessTime, inode->i_atime); udf_time_to_disk_stamp(&efe->modificationTime, inode->i_mtime); |