From 2aaf27776f323a197e71cd9203826e85334311e1 Mon Sep 17 00:00:00 2001 From: tl Date: Tue, 21 May 2024 09:39:41 +0800 Subject: [PATCH 1/2] sharefs codex Signed-off-by: tl --- fs/sharefs/authentication.h | 5 +++++ fs/sharefs/file.c | 6 ++---- fs/sharefs/inode.c | 3 +-- fs/sharefs/main.c | 9 ++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fs/sharefs/authentication.h b/fs/sharefs/authentication.h index 165b66fc9c4f..e598fa883c0a 100644 --- a/fs/sharefs/authentication.h +++ b/fs/sharefs/authentication.h @@ -5,6 +5,9 @@ * Copyright (c) 2023 Huawei Device Co., Ltd. */ +#ifndef AUTHENTICATION_H +#define AUTHENTICATION_H + #include "sharefs.h" #define OID_ROOT 0 @@ -73,3 +76,5 @@ static inline int get_bundle_uid(struct sharefs_sb_info *sbi, const char *bname) { return sbi->user_id * BASE_USER_RANGE + get_bid_config(bname); } + +#endif //_AUTHENTICATION_H_ \ No newline at end of file diff --git a/fs/sharefs/file.c b/fs/sharefs/file.c index 238cc2f7484d..f04963d57a4a 100644 --- a/fs/sharefs/file.c +++ b/fs/sharefs/file.c @@ -157,8 +157,7 @@ static loff_t sharefs_file_llseek(struct file *file, loff_t offset, int whence) /* * Sharefs read_iter, redirect modified iocb to lower read_iter */ -ssize_t -sharefs_read_iter(struct kiocb *iocb, struct iov_iter *iter) +ssize_t sharefs_read_iter(struct kiocb *iocb, struct iov_iter *iter) { int err; struct file *file = iocb->ki_filp; @@ -188,8 +187,7 @@ sharefs_read_iter(struct kiocb *iocb, struct iov_iter *iter) /* * Sharefs write_iter, redirect modified iocb to lower write_iter */ -ssize_t -sharefs_write_iter(struct kiocb *iocb, struct iov_iter *iter) +ssize_t sharefs_write_iter(struct kiocb *iocb, struct iov_iter *iter) { int err; struct file *file = iocb->ki_filp; diff --git a/fs/sharefs/inode.c b/fs/sharefs/inode.c index 23d8530e8595..d0964f744338 100644 --- a/fs/sharefs/inode.c +++ b/fs/sharefs/inode.c @@ -77,8 +77,7 @@ static int sharefs_getattr(const struct path *path, struct kstat *stat, return ret; } -static ssize_t -sharefs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) +static ssize_t sharefs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) { int err; struct dentry *lower_dentry; diff --git a/fs/sharefs/main.c b/fs/sharefs/main.c index 6a858b49f73b..194430ff4e3d 100644 --- a/fs/sharefs/main.c +++ b/fs/sharefs/main.c @@ -145,7 +145,6 @@ static struct file_system_type sharefs_fs_type = { .kill_sb = generic_shutdown_super, .fs_flags = 0, }; -MODULE_ALIAS_FS(SHAREFS_NAME); static int __init init_sharefs_fs(void) { @@ -185,9 +184,9 @@ static void __exit exit_sharefs_fs(void) pr_info("Completed sharefs module unload\n"); } -MODULE_AUTHOR("Jingjing Mao"); -MODULE_DESCRIPTION("Sharefs"); -MODULE_LICENSE("GPL"); - module_init(init_sharefs_fs); module_exit(exit_sharefs_fs); +MODULE_LICENSE("GPL V2"); +MODULE_AUTHOR("Jingjing Mao"); +MODULE_DESCRIPTION("Share File System"); +MODULE_ALIAS_FS("sharefs"); -- Gitee From 9f8224186786cdd5b2a87f889062cd139cacd792 Mon Sep 17 00:00:00 2001 From: tl <1095834941@qq.com> Date: Tue, 21 May 2024 02:34:53 +0000 Subject: [PATCH 2/2] update fs/sharefs/main.c. Signed-off-by: tl <1095834941@qq.com> --- fs/sharefs/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/sharefs/main.c b/fs/sharefs/main.c index 194430ff4e3d..2ce5bb71bcac 100644 --- a/fs/sharefs/main.c +++ b/fs/sharefs/main.c @@ -186,6 +186,7 @@ static void __exit exit_sharefs_fs(void) module_init(init_sharefs_fs); module_exit(exit_sharefs_fs); + MODULE_LICENSE("GPL V2"); MODULE_AUTHOR("Jingjing Mao"); MODULE_DESCRIPTION("Share File System"); -- Gitee