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

fuse: on 64-bit store time in d_fsdata directly

Browse Source 
Implements the optimization noted in commit f75fdf22b0 ("fuse: don't
use ->d_time"), as the additional memory can be significant.  (In
particular, on SLAB configurations this 8-byte alloc becomes 32 bytes).
Per-dentry, this can consume significant memory.

Reviewed-by: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Khazhismel Kumykov 2019-09-16 16:56:41 -07:00 committed by Miklos Szeredi
parent d5880c7a86
commit 30c6a23d34
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/fuse/dir.c
View File

@ -24,11 +24,34 @@ 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
static inline void __fuse_dentry_settime(struct dentry *entry, u64 time)
{
entry->d_fsdata = (void *) time;
}
static inline u64 fuse_dentry_time(const struct dentry *entry)
{
return (u64)entry->d_fsdata;
}
#else
union fuse_dentry { union fuse_dentry {
u64 time; u64 time;
struct rcu_head rcu; struct rcu_head rcu;
}; };
static inline void __fuse_dentry_settime(struct dentry *dentry, u64 time)
{
((union fuse_dentry *) dentry->d_fsdata)->time = time;
}
static inline u64 fuse_dentry_time(const struct dentry *entry)
{
return ((union fuse_dentry *) entry->d_fsdata)->time;
}
#endif
static void fuse_dentry_settime(struct dentry *dentry, u64 time) static void fuse_dentry_settime(struct dentry *dentry, u64 time)
{ {
struct fuse_conn *fc = get_fuse_conn_super(dentry->d_sb); struct fuse_conn *fc = get_fuse_conn_super(dentry->d_sb);
@ -47,12 +70,7 @@ static void fuse_dentry_settime(struct dentry *dentry, u64 time)
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
} }
((union fuse_dentry *) dentry->d_fsdata)->time = time; __fuse_dentry_settime(dentry, time);
}
static inline u64 fuse_dentry_time(const struct dentry *entry)
{
return ((union fuse_dentry *) entry->d_fsdata)->time;
} }
/* /*
@ -258,6 +276,7 @@ invalid:
goto out; goto out;
} }
#if BITS_PER_LONG < 64
static int fuse_dentry_init(struct dentry *dentry) static int fuse_dentry_init(struct dentry *dentry)
{ {
dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL); dentry->d_fsdata = kzalloc(sizeof(union fuse_dentry), GFP_KERNEL);
@ -270,6 +289,7 @@ static void fuse_dentry_release(struct dentry *dentry)
kfree_rcu(fd, rcu); kfree_rcu(fd, rcu);
} }
#endif
static int fuse_dentry_delete(const struct dentry *dentry) static int fuse_dentry_delete(const struct dentry *dentry)
{ {
@ -279,13 +299,17 @@ static int fuse_dentry_delete(const struct dentry *dentry)
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_delete = fuse_dentry_delete, .d_delete = fuse_dentry_delete,
#if BITS_PER_LONG < 64
.d_init = fuse_dentry_init, .d_init = fuse_dentry_init,
.d_release = fuse_dentry_release, .d_release = fuse_dentry_release,
#endif
}; };
const struct dentry_operations fuse_root_dentry_operations = { const struct dentry_operations fuse_root_dentry_operations = {
#if BITS_PER_LONG < 64
.d_init = fuse_dentry_init, .d_init = fuse_dentry_init,
.d_release = fuse_dentry_release, .d_release = fuse_dentry_release,
#endif
}; };
int fuse_valid_type(int m) int fuse_valid_type(int m)