From: "J. R. Okajima" <hooanon...@gmail.com>
commit 3792c81561c787a50cd5d5d788f118c22d8eab40 aufs5-standalone upstream.
This series "pre fs_context" prepares for the succeeding series
"fs_context" which makes aufs supports new fsopen/fsconfig/fsmount
systemcalls.
The commit itself is less meaningful and never affect the behaviour.
Signed-off-by: J. R. Okajima <hooanon...@gmail.com>
Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com>
---
fs/aufs/sbinfo.c | 8 ++++----
fs/aufs/super.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/aufs/sbinfo.c b/fs/aufs/sbinfo.c
index 91e62d79e099..2a2b804d1029 100644
--- a/fs/aufs/sbinfo.c
+++ b/fs/aufs/sbinfo.c
@@ -56,10 +56,10 @@ void au_si_free(struct kobject *kobj)
au_kfree_rcu(sbinfo);
}
-int au_si_alloc(struct super_block *sb)
+struct au_sbinfo *au_si_alloc(struct super_block *sb)
{
- int err, i;
struct au_sbinfo *sbinfo;
+ int err, i;
err = -ENOMEM;
sbinfo = kzalloc(sizeof(*sbinfo), GFP_NOFS);
@@ -126,14 +126,14 @@ int au_si_alloc(struct super_block *sb)
sbinfo->si_sb = sb;
sb->s_fs_info = sbinfo;
si_pid_set(sb);
- return 0; /* success */
+ return sbinfo; /* success */
out_br:
au_kfree_try_rcu(sbinfo->si_branch);
out_sbinfo:
au_kfree_rcu(sbinfo);
out:
- return err;
+ return ERR_PTR(err);
}
int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink)
diff --git a/fs/aufs/super.h b/fs/aufs/super.h
index 4a7ac7acdb52..fd56cad2d117 100644
--- a/fs/aufs/super.h
+++ b/fs/aufs/super.h
@@ -272,7 +272,7 @@ void au_iarray_free(struct inode **a, unsigned long long
max);
/* sbinfo.c */
void au_si_free(struct kobject *kobj);
-int au_si_alloc(struct super_block *sb);
+struct au_sbinfo *au_si_alloc(struct super_block *sb);
int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink);
unsigned int au_sigen_inc(struct super_block *sb);
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11067):
https://lists.yoctoproject.org/g/linux-yocto/message/11067
Mute This Topic: https://lists.yoctoproject.org/mt/90000696/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
