FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-18 07:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfat: don't use ->d_time

Browse Source 
Use d_fsdata instead, which is the same size.  Introduce helpers to hide
the typecasts.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
This commit is contained in:
Miklos Szeredi 2016-09-16 12:44:21 +02:00
parent a00be0e31f
commit 814184fd40
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/fat/namei_vfat.c
View File

@ -21,6 +21,17 @@
#include <linux/namei.h> #include <linux/namei.h>
#include "fat.h" #include "fat.h"
static inline unsigned long vfat_d_version(struct dentry *dentry)
{
return (unsigned long) dentry->d_fsdata;
}
static inline void vfat_d_version_set(struct dentry *dentry,
unsigned long version)
{
dentry->d_fsdata = (void *) version;
}
/* /*
* If new entry was created in the parent, it could create the 8.3 * If new entry was created in the parent, it could create the 8.3
* alias (the shortname of logname). So, the parent may have the * alias (the shortname of logname). So, the parent may have the
@ -33,7 +44,7 @@ static int vfat_revalidate_shortname(struct dentry *dentry)
{ {
int ret = 1; int ret = 1;
spin_lock(&dentry->d_lock); spin_lock(&dentry->d_lock);
if (dentry->d_time != d_inode(dentry->d_parent)->i_version) if (vfat_d_version(dentry) != d_inode(dentry->d_parent)->i_version)
ret = 0; ret = 0;
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
return ret; return ret;
@ -759,7 +770,7 @@ static struct dentry *vfat_lookup(struct inode *dir, struct dentry *dentry,
out: out:
mutex_unlock(&MSDOS_SB(sb)->s_lock); mutex_unlock(&MSDOS_SB(sb)->s_lock);
if (!inode) if (!inode)
dentry->d_time = dir->i_version; vfat_d_version_set(dentry, dir->i_version);
return d_splice_alias(inode, dentry); return d_splice_alias(inode, dentry);
error: error:
mutex_unlock(&MSDOS_SB(sb)->s_lock); mutex_unlock(&MSDOS_SB(sb)->s_lock);
@ -823,7 +834,7 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
clear_nlink(inode); clear_nlink(inode);
inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC; inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;
fat_detach(inode); fat_detach(inode);
dentry->d_time = dir->i_version; vfat_d_version_set(dentry, dir->i_version);
out: out:
mutex_unlock(&MSDOS_SB(sb)->s_lock); mutex_unlock(&MSDOS_SB(sb)->s_lock);
@ -849,7 +860,7 @@ static int vfat_unlink(struct inode *dir, struct dentry *dentry)
clear_nlink(inode); clear_nlink(inode);
inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC; inode->i_mtime = inode->i_atime = CURRENT_TIME_SEC;
fat_detach(inode); fat_detach(inode);
dentry->d_time = dir->i_version; vfat_d_version_set(dentry, dir->i_version);
out: out:
mutex_unlock(&MSDOS_SB(sb)->s_lock); mutex_unlock(&MSDOS_SB(sb)->s_lock);