Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

exfat: use timespec64 instead of timespec for kernel 3.17+ #143

Closed
wants to merge 1 commit into from
Closed

exfat: use timespec64 instead of timespec for kernel 3.17+ #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions exfat_oal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
/* */
/************************************************************************/

#include <linux/ktime.h>
#include <linux/semaphore.h>
#include <linux/time.h>
#include <linux/timekeeping.h>

#include "exfat_config.h"
#include "exfat_api.h"
Expand Down Expand Up @@ -128,13 +130,13 @@ static time_t accum_days_in_year[] = {

TIMESTAMP_T *tm_current(TIMESTAMP_T *tp)
{
struct timespec ts;
timespec_t ts;
time_t second, day, leap_day, month, year;

#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
ts = CURRENT_TIME_SEC;
#else
ktime_get_real_ts(&ts);
ktime_get_real_ts64(&ts);
#endif

second = ts.tv_sec;
Expand Down
7 changes: 7 additions & 0 deletions exfat_oal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@
/* Constant & Macro Definitions (Non-Configurable) */
/*----------------------------------------------------------------------*/

#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
#define current_time(x) (CURRENT_TIME_SEC)
typedef struct timespec timespec_t;
#else
typedef struct timespec64 timespec_t;
#endif

/*----------------------------------------------------------------------*/
/* Type Definitions */
/*----------------------------------------------------------------------*/
Expand Down
12 changes: 5 additions & 7 deletions exfat_super.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

#include <linux/kernel.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
Expand Down Expand Up @@ -98,11 +99,7 @@ static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET;

extern struct timezone sys_tz;

#if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0)
#define current_time(x) (CURRENT_TIME_SEC)
#endif

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,16,0)
#define USE_NEW_IVERSION_API
#define INC_IVERSION(x) (inode_inc_iversion(x))
#define GET_IVERSION(x) (inode_peek_iversion_raw(x))
Expand Down Expand Up @@ -147,7 +144,7 @@ static time_t accum_days_in_year[] = {
static void _exfat_truncate(struct inode *inode, loff_t old_size);

/* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */
void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts,
void exfat_time_fat2unix(struct exfat_sb_info *sbi, timespec_t *ts,
DATE_TIME_T *tp)
{
time_t year = tp->Year;
Expand All @@ -166,7 +163,7 @@ void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts,
}

/* Convert linear UNIX date to a FAT time/date pair. */
void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec *ts,
void exfat_time_unix2fat(struct exfat_sb_info *sbi, timespec_t *ts,
DATE_TIME_T *tp)
{
time_t second = ts->tv_sec;
Expand Down Expand Up @@ -1919,6 +1916,7 @@ static int exfat_fill_inode(struct inode *inode, FILE_ID_T *fid)
i_size_write(inode, info.Size);
EXFAT_I(inode)->mmu_private = i_size_read(inode);
}

exfat_save_attr(inode, info.Attr);

inode->i_blocks = ((i_size_read(inode) + (p_fs->cluster_size - 1))
Expand Down