iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fuse: don't use ->d_time

Browse Source 
Store in memory pointed to by ->d_fsdata.  Use ->d_init() to allocate the
storage.  Need to use RCU freeing because the data is used in RCU lookup
mode.

We could cast ->d_fsdata directly on 64bit archs, but I don't think this is
worth the extra complexity.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2016-10-01 07:32:32 +02:00
parent 60bcc88ad1
commit f75fdf22b0
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fs/fuse/dir.c
View File

@ -39,37 +39,25 @@ static void fuse_advise_use_readdirplus(struct inode *dir)
set_bit(FUSE_I_ADVISE_RDPLUS, &fi->state); set_bit(FUSE_I_ADVISE_RDPLUS, &fi->state);
} }
#if BITS_PER_LONG >= 64 union fuse_dentry {
u64 time;
struct rcu_head rcu;
};
static inline void fuse_dentry_settime(struct dentry *entry, u64 time) static inline void fuse_dentry_settime(struct dentry *entry, u64 time)
{ {
entry->d_time = time; ((union fuse_dentry *) entry->d_fsdata)->time = time;
} }
static inline u64 fuse_dentry_time(struct dentry *entry) static inline u64 fuse_dentry_time(struct dentry *entry)
{ {
return entry->d_time; return ((union fuse_dentry *) entry->d_fsdata)->time;
} }
#else
/*
* On 32 bit archs store the high 32 bits of time in d_fsdata
*/
static void fuse_dentry_settime(struct dentry *entry, u64 time)
{
entry->d_time = time;
entry->d_fsdata = (void *) (unsigned long) (time >> 32);
}
static u64 fuse_dentry_time(struct dentry *entry)
{
return (u64) entry->d_time +
((u64) (unsigned long) entry->d_fsdata << 32);
}
#endif
/* /*
* FUSE caches dentries and attributes with separate timeout. The * FUSE caches dentries and attributes with separate timeout. The
* time in jiffies until the dentry/attributes are valid is stored in * time in jiffies until the dentry/attributes are valid is stored in
* dentry->d_time and fuse_inode->i_time respectively. * dentry->d_fsdata and fuse_inode->i_time respectively.
*/ */
/* /*
@ -275,8 +263,23 @@ static int invalid_nodeid(u64 nodeid)
return !nodeid || nodeid == FUSE_ROOT_ID; return !nodeid || nodeid == FUSE_ROOT_ID;
} }
static int fuse_dentry_init(struct dentry *dentry)
{
dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL);
return dentry->d_fsdata ? 0 : -ENOMEM;
}
static void fuse_dentry_release(struct dentry *dentry)
{
union fuse_dentry *fd = dentry->d_fsdata;
kfree_rcu(fd, rcu);
}
const struct dentry_operations fuse_dentry_operations = { const struct dentry_operations fuse_dentry_operations = {
.d_revalidate = fuse_dentry_revalidate, .d_revalidate = fuse_dentry_revalidate,
.d_init = fuse_dentry_init,
.d_release = fuse_dentry_release,
}; };
int fuse_valid_type(int m) int fuse_valid_type(int m)