From: Deepa Dinamani <deepa.kernel@gmail.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
y2038@lists.linaro.org
Subject: [RFC 10/15] fs: fat: replace inode_timespec with timespec64
Date: Wed, 6 Jan 2016 21:36:07 -0800 [thread overview]
Message-ID: <1452144972-15802-11-git-send-email-deepa.kernel@gmail.com> (raw)
In-Reply-To: <1452144972-15802-1-git-send-email-deepa.kernel@gmail.com>
Substitute inode_timespec aliases with timespec64.
Since CONFIG_FS_USES_64BIT_TIME is enabled, internally
all inode_timespec references are using timespec64
already.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
---
fs/fat/dir.c | 4 ++--
fs/fat/fat.h | 6 +++---
fs/fat/file.c | 4 ++--
fs/fat/inode.c | 12 ++++++------
fs/fat/misc.c | 4 ++--
fs/fat/namei_msdos.c | 8 ++++----
fs/fat/namei_vfat.c | 14 +++++++-------
7 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index fa8a922..683f973 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -1034,7 +1034,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
struct super_block *sb = dir->i_sb;
struct msdos_dir_entry *de;
struct buffer_head *bh;
- struct inode_timespec now;
+ struct timespec64 now;
int err = 0, nr_slots;
/*
@@ -1133,7 +1133,7 @@ error:
return err;
}
-int fat_alloc_new_dir(struct inode *dir, struct inode_timespec *ts)
+int fat_alloc_new_dir(struct inode *dir, struct timespec64 *ts)
{
struct super_block *sb = dir->i_sb;
struct msdos_sb_info *sbi = MSDOS_SB(sb);
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index cabb0fd..859626a 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -303,7 +303,7 @@ extern int fat_scan_logstart(struct inode *dir, int i_logstart,
struct fat_slot_info *sinfo);
extern int fat_get_dotdot_entry(struct inode *dir, struct buffer_head **bh,
struct msdos_dir_entry **de);
-extern int fat_alloc_new_dir(struct inode *dir, struct inode_timespec *ts);
+extern int fat_alloc_new_dir(struct inode *dir, struct timespec64 *ts);
extern int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
struct fat_slot_info *sinfo);
extern int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo);
@@ -406,10 +406,10 @@ void fat_msg(struct super_block *sb, const char *level, const char *fmt, ...);
extern int fat_clusters_flush(struct super_block *sb);
extern int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster);
extern void fat_time_fat2unix(struct msdos_sb_info *sbi,
- struct inode_timespec *ts,
+ struct timespec64 *ts,
__le16 __time, __le16 __date, u8 time_cs);
extern void fat_time_unix2fat(struct msdos_sb_info *sbi,
- struct inode_timespec *ts,
+ struct timespec64 *ts,
__le16 *time, __le16 *date, u8 *time_cs);
extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs);
diff --git a/fs/fat/file.c b/fs/fat/file.c
index e7f060f..48c985d 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -188,7 +188,7 @@ static int fat_cont_expand(struct inode *inode, loff_t size)
{
struct address_space *mapping = inode->i_mapping;
loff_t start = inode->i_size, count = size - inode->i_size;
- struct inode_timespec ts;
+ struct timespec64 ts;
int err;
err = generic_cont_expand_simple(inode, size);
@@ -283,7 +283,7 @@ error:
static int fat_free(struct inode *inode, int skip)
{
struct super_block *sb = inode->i_sb;
- struct inode_timespec ts;
+ struct timespec64 ts;
int err, wait, free_start, i_start, i_logstart;
if (MSDOS_I(inode)->i_start == 0)
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index a1eba05..03a8fa0 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -232,7 +232,7 @@ static int fat_write_end(struct file *file, struct address_space *mapping,
struct page *pagep, void *fsdata)
{
struct inode *inode = mapping->host;
- struct inode_timespec ts;
+ struct timespec64 ts;
int err;
err = generic_write_end(file, mapping, pos, len, copied, pagep, fsdata);
if (err < len)
@@ -505,7 +505,7 @@ static int fat_validate_dir(struct inode *dir)
int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
{
struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
- struct inode_timespec mtime, ctime, atime;
+ struct timespec64 mtime, ctime, atime;
int error;
MSDOS_I(inode)->i_pos = 0;
@@ -840,7 +840,7 @@ static int __fat_write_inode(struct inode *inode, int wait)
struct msdos_sb_info *sbi = MSDOS_SB(sb);
struct buffer_head *bh;
struct msdos_dir_entry *raw_entry;
- struct inode_timespec ts;
+ struct timespec64 ts;
loff_t i_pos;
sector_t blocknr;
int err, offset;
@@ -1402,9 +1402,9 @@ static int fat_read_root(struct inode *inode)
MSDOS_I(inode)->mmu_private = inode->i_size;
fat_save_attrs(inode, ATTR_DIR);
- VFS_INODE_SET_XTIME(i_atime, inode, ((struct inode_timespec) {0, 0}));
- VFS_INODE_SET_XTIME(i_mtime, inode, ((struct inode_timespec) {0, 0}));
- VFS_INODE_SET_XTIME(i_ctime, inode, ((struct inode_timespec) {0, 0}));
+ VFS_INODE_SET_XTIME(i_atime, inode, ((struct timespec64) {0, 0}));
+ VFS_INODE_SET_XTIME(i_mtime, inode, ((struct timespec64) {0, 0}));
+ VFS_INODE_SET_XTIME(i_ctime, inode, ((struct timespec64) {0, 0}));
set_nlink(inode, fat_subdirs(inode)+2);
return 0;
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 1544498..3ed5fbd 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -186,7 +186,7 @@ static time_t days_in_year[] = {
};
/* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */
-void fat_time_fat2unix(struct msdos_sb_info *sbi, struct inode_timespec *ts,
+void fat_time_fat2unix(struct msdos_sb_info *sbi, struct timespec64 *ts,
__le16 __time, __le16 __date, u8 time_cs)
{
u16 time = le16_to_cpu(__time), date = le16_to_cpu(__date);
@@ -225,7 +225,7 @@ void fat_time_fat2unix(struct msdos_sb_info *sbi, struct inode_timespec *ts,
}
/* Convert linear UNIX date to a FAT time/date pair. */
-void fat_time_unix2fat(struct msdos_sb_info *sbi, struct inode_timespec *ts,
+void fat_time_unix2fat(struct msdos_sb_info *sbi, struct timespec64 *ts,
__le16 *time, __le16 *date, u8 *time_cs)
{
struct tm tm;
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
index 457dcfb..faa1274 100644
--- a/fs/fat/namei_msdos.c
+++ b/fs/fat/namei_msdos.c
@@ -224,7 +224,7 @@ static struct dentry *msdos_lookup(struct inode *dir, struct dentry *dentry,
/***** Creates a directory entry (name is already formatted). */
static int msdos_add_entry(struct inode *dir, const unsigned char *name,
int is_dir, int is_hid, int cluster,
- struct inode_timespec *ts,
+ struct timespec64 *ts,
struct fat_slot_info *sinfo)
{
struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb);
@@ -267,7 +267,7 @@ static int msdos_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct super_block *sb = dir->i_sb;
struct inode *inode = NULL;
struct fat_slot_info sinfo;
- struct inode_timespec ts;
+ struct timespec64 ts;
unsigned char msdos_name[MSDOS_NAME];
int err, is_hid;
@@ -351,7 +351,7 @@ static int msdos_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
struct fat_slot_info sinfo;
struct inode *inode;
unsigned char msdos_name[MSDOS_NAME];
- struct inode_timespec ts;
+ struct timespec64 ts;
int err, is_hid, cluster;
mutex_lock(&MSDOS_SB(sb)->s_lock);
@@ -442,7 +442,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
struct inode *old_inode, *new_inode;
struct super_block *sb = old_dir->i_sb;
struct fat_slot_info old_sinfo, sinfo;
- struct inode_timespec ts;
+ struct timespec64 ts;
loff_t new_i_pos;
int err, old_attrs, is_dir, update_dotdot, corrupt = 0;
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 31da5b6..84c309d 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -577,7 +577,7 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
static int vfat_build_slots(struct inode *dir, const unsigned char *name,
int len, int is_dir, int cluster,
- struct inode_timespec *ts,
+ struct timespec64 *ts,
struct msdos_dir_slot *slots, int *nr_slots)
{
struct msdos_sb_info *sbi = MSDOS_SB(dir->i_sb);
@@ -653,7 +653,7 @@ out_free:
}
static int vfat_add_entry(struct inode *dir, struct qstr *qname, int is_dir,
- int cluster, struct inode_timespec *ts,
+ int cluster, struct timespec64 *ts,
struct fat_slot_info *sinfo)
{
struct msdos_dir_slot *slots;
@@ -774,7 +774,7 @@ static int vfat_create(struct inode *dir, struct dentry *dentry, umode_t mode,
struct super_block *sb = dir->i_sb;
struct inode *inode;
struct fat_slot_info sinfo;
- struct inode_timespec ts;
+ struct timespec64 ts;
int err;
mutex_lock(&MSDOS_SB(sb)->s_lock);
@@ -808,7 +808,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
struct inode *inode = d_inode(dentry);
struct super_block *sb = dir->i_sb;
struct fat_slot_info sinfo;
- struct inode_timespec now;
+ struct timespec64 now;
int err;
mutex_lock(&MSDOS_SB(sb)->s_lock);
@@ -842,7 +842,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry)
struct inode *inode = d_inode(dentry);
struct super_block *sb = dir->i_sb;
struct fat_slot_info sinfo;
- struct inode_timespec now;
+ struct timespec64 now;
int err;
mutex_lock(&MSDOS_SB(sb)->s_lock);
@@ -871,7 +871,7 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
struct super_block *sb = dir->i_sb;
struct inode *inode;
struct fat_slot_info sinfo;
- struct inode_timespec ts;
+ struct timespec64 ts;
int err, cluster;
mutex_lock(&MSDOS_SB(sb)->s_lock);
@@ -921,7 +921,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
struct msdos_dir_entry *dotdot_de;
struct inode *old_inode, *new_inode;
struct fat_slot_info old_sinfo, sinfo;
- struct inode_timespec ts;
+ struct timespec64 ts;
loff_t new_i_pos;
int err, is_dir, update_dotdot, corrupt = 0;
struct super_block *sb = old_dir->i_sb;
--
1.9.1
next prev parent reply other threads:[~2016-01-07 5:36 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 5:35 [RFC 00/15] Add 64 bit timestamp support Deepa Dinamani
2016-01-07 5:35 ` [RFC 01/15] fs: add Kconfig entry CONFIG_FS_USES_64BIT_TIME Deepa Dinamani
2016-01-07 5:35 ` [RFC 02/15] vfs: Change all structures to support 64 bit time Deepa Dinamani
2016-01-10 23:03 ` Dave Chinner
2016-01-12 5:42 ` Deepa Dinamani
2016-01-12 8:29 ` Dave Chinner
2016-01-12 9:27 ` [Y2038] " Arnd Bergmann
2016-01-13 6:27 ` Dave Chinner
2016-01-13 9:20 ` Arnd Bergmann
2016-01-13 9:20 ` Arnd Bergmann
2016-01-13 16:33 ` Deepa Dinamani
2016-01-13 21:04 ` Dave Chinner
2016-01-14 16:53 ` [Y2038] " Arnd Bergmann
2016-01-14 18:00 ` Deepa Dinamani
2016-01-14 21:00 ` Dave Chinner
2016-01-14 22:46 ` Arnd Bergmann
2016-01-14 22:54 ` Arnd Bergmann
2016-01-15 2:27 ` Dave Chinner
2016-01-15 17:01 ` Arnd Bergmann
2016-01-15 22:41 ` Dave Chinner
2016-01-15 2:49 ` Dave Chinner
2016-01-15 16:50 ` Arnd Bergmann
2016-01-16 19:14 ` Andreas Dilger
2016-01-16 23:36 ` Arnd Bergmann
2016-01-17 2:30 ` Andreas Dilger
2016-01-18 6:09 ` Deepa Dinamani
2016-01-18 10:56 ` Arnd Bergmann
2016-01-18 17:40 ` Deepa Dinamani
2016-01-18 19:53 ` Arnd Bergmann
2016-01-18 21:14 ` Dave Chinner
2016-01-18 21:46 ` Arnd Bergmann
2016-01-19 1:38 ` Dave Chinner
2016-01-19 5:27 ` Deepa Dinamani
2016-01-19 20:49 ` Dave Chinner
2016-01-19 22:25 ` Arnd Bergmann
2016-01-20 5:12 ` Deepa Dinamani
2016-01-20 15:04 ` Deepa Dinamani
2016-01-20 23:06 ` Dave Chinner
2016-01-20 23:17 ` [Y2038] " Arnd Bergmann
2016-01-27 6:26 ` Deepa Dinamani
2016-01-15 5:03 ` Deepa Dinamani
2016-01-07 5:36 ` [RFC 03/15] kernel: time: Add macros and functions " Deepa Dinamani
2016-01-07 5:36 ` [RFC 04/15] vfs: Add support for vfs code to use " Deepa Dinamani
2016-01-07 5:36 ` [RFC 05/15] fs: cifs: Add support for cifs " Deepa Dinamani
2016-01-07 5:36 ` [RFC 06/15] fs: fat: convert fat to " Deepa Dinamani
2016-01-07 5:36 ` [RFC 07/15] fs: ext4: convert to use " Deepa Dinamani
2016-01-07 5:36 ` [RFC 08/15] fs: Enable " Deepa Dinamani
2016-01-07 5:36 ` [RFC 09/15] fs: cifs: replace inode_timespec with timespec64 Deepa Dinamani
2016-01-07 5:36 ` Deepa Dinamani [this message]
2016-01-07 5:36 ` [RFC 11/15] fs: ext4: " Deepa Dinamani
2016-01-07 5:36 ` [RFC 12/15] vfs: remove inode_timespec and timespec references Deepa Dinamani
2016-01-07 5:36 ` [RFC 13/15] kernel: time: change inode_timespec to timespec64 Deepa Dinamani
2016-01-07 8:50 ` Michael Adam
2016-01-07 10:42 ` Deepa Dinamani
2016-01-07 5:36 ` [RFC 14/15] vfs: Remove inode_timespec aliases Deepa Dinamani
2016-01-07 5:36 ` [RFC 15/15] fs: Drop CONFIG_FS_USES_64BIT_TIME Deepa Dinamani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452144972-15802-11-git-send-email-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.