diff --git a/fs/lustre/llite/dir.c b/fs/lustre/llite/dir.c
index a7a419abf45a..0c1b1ed31601 100644
--- a/fs/lustre/llite/dir.c
+++ b/fs/lustre/llite/dir.c
@@ -1346,7 +1346,7 @@ int quotactl_ioctl(struct super_block *sb, struct if_quotactl *qctl)
 	return rc;
 }
 
-int ll_rmfid(struct file *file, void __user *arg)
+static int ll_rmfid(struct file *file, void __user *arg)
 {
 	const struct fid_array __user *ufa = arg;
 	struct inode *inode = file_inode(file);
diff --git a/fs/lustre/llite/file.c b/fs/lustre/llite/file.c
index c7f77295d3b3..8564ee4a879c 100644
--- a/fs/lustre/llite/file.c
+++ b/fs/lustre/llite/file.c
@@ -4566,7 +4566,7 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	return rc;
 }
 
-loff_t ll_lseek(struct file *file, loff_t offset, int whence)
+static loff_t ll_lseek(struct file *file, loff_t offset, int whence)
 {
 	struct inode *inode = file_inode(file);
 	struct lu_env *env;
@@ -5496,8 +5496,8 @@ int ll_getattr(const struct path *path, struct kstat *stat,
 				 false);
 }
 
-int cl_falloc(struct file *file, struct inode *inode, int mode, loff_t offset,
-	      loff_t len)
+static int cl_falloc(struct file *file, struct inode *inode, int mode,
+		     loff_t offset, loff_t len)
 {
 	loff_t size = i_size_read(inode);
 	struct lu_env *env;
@@ -5559,7 +5559,7 @@ int cl_falloc(struct file *file, struct inode *inode, int mode, loff_t offset,
 	return rc;
 }
 
-long ll_fallocate(struct file *filp, int mode, loff_t offset, loff_t len)
+static long ll_fallocate(struct file *filp, int mode, loff_t offset, loff_t len)
 {
 	struct inode *inode = file_inode(filp);
 	int rc;
diff --git a/fs/lustre/llite/llite_lib.c b/fs/lustre/llite/llite_lib.c
index 9adb7ef4ffac..b4d5b3dca0a7 100644
--- a/fs/lustre/llite/llite_lib.c
+++ b/fs/lustre/llite/llite_lib.c
@@ -1897,8 +1897,8 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data)
  * Return:	0 on success
  *		errno on failure
  */
-int ll_io_zero_page(struct inode *inode, pgoff_t index, pgoff_t offset,
-		    unsigned int len)
+static int ll_io_zero_page(struct inode *inode, pgoff_t index, pgoff_t offset,
+			   unsigned int len)
 {
 	struct ll_inode_info *lli = ll_i2info(inode);
 	struct cl_object *clob = lli->lli_clob;
@@ -2753,7 +2753,7 @@ static inline bool ll_default_lmv_inherited(struct lmv_stripe_md *pdmv,
 /* if default LMV is implicitly inherited, subdir default LMV is maintained on
  * client side.
  */
-int ll_dir_default_lmv_inherit(struct inode *dir, struct inode *inode)
+static int ll_dir_default_lmv_inherit(struct inode *dir, struct inode *inode)
 {
 	struct ll_inode_info *plli = ll_i2info(dir);
 	struct ll_inode_info *lli = ll_i2info(inode);
diff --git a/fs/lustre/llite/namei.c b/fs/lustre/llite/namei.c
index 6159f8975847..79df426fcbbb 100644
--- a/fs/lustre/llite/namei.c
+++ b/fs/lustre/llite/namei.c
@@ -384,7 +384,7 @@ static void ll_lock_cancel_bits(struct ldlm_lock *lock, u64 to_cancel)
 /* Check if the given lock may be downgraded instead of canceling and
  * that convert is really needed.
  */
-int ll_md_need_convert(struct ldlm_lock *lock)
+static int ll_md_need_convert(struct ldlm_lock *lock)
 {
 	struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
 	struct inode *inode;
diff --git a/fs/lustre/llite/pcc.c b/fs/lustre/llite/pcc.c
index ac9124f9554e..677f5f38f100 100644
--- a/fs/lustre/llite/pcc.c
+++ b/fs/lustre/llite/pcc.c
@@ -795,7 +795,7 @@ pcc_dataset_add(struct pcc_super *super, struct pcc_cmd *cmd)
 	return rc;
 }
 
-struct pcc_dataset *
+static struct pcc_dataset *
 pcc_dataset_get(struct pcc_super *super, enum lu_pcc_type type, u32 id)
 {
 	struct pcc_dataset *dataset;
@@ -2152,8 +2152,8 @@ static int __pcc_inode_create(struct pcc_dataset *dataset,
  * Reset uid, gid or size for the PCC copy masked by @valid.
  * TODO: Set the project ID for PCC copy.
  */
-int pcc_inode_reset_iattr(struct dentry *dentry, unsigned int valid,
-			  kuid_t uid, kgid_t gid, loff_t size)
+static int pcc_inode_reset_iattr(struct dentry *dentry, unsigned int valid,
+				 kuid_t uid, kgid_t gid, loff_t size)
 {
 	struct inode *inode = dentry->d_inode;
 	struct iattr attr;
diff --git a/fs/lustre/llite/rw.c b/fs/lustre/llite/rw.c
index e258d995c54b..04fde756035f 100644
--- a/fs/lustre/llite/rw.c
+++ b/fs/lustre/llite/rw.c
@@ -150,7 +150,7 @@ void ll_ra_stats_inc(struct inode *inode, enum ra_stat which)
 	ll_ra_stats_inc_sbi(sbi, which);
 }
 
-void ll_ra_stats_add(struct inode *inode, enum ra_stat which, long count)
+static void ll_ra_stats_add(struct inode *inode, enum ra_stat which, long count)
 {
 	struct ll_sb_info *sbi = ll_i2sbi(inode);
 
diff --git a/fs/lustre/llite/vvp_dev.c b/fs/lustre/llite/vvp_dev.c
index 298720c5bfc2..0864ac499c4e 100644
--- a/fs/lustre/llite/vvp_dev.c
+++ b/fs/lustre/llite/vvp_dev.c
@@ -42,13 +42,9 @@
 #include "llite_internal.h"
 #include "vvp_internal.h"
 
-/*****************************************************************************
- *
+/*
  * Vvp device and device type functions.
  *
- */
-
-/*
  * vvp_ prefix stands for "Vfs Vm Posix". It corresponds to historical
  * "llite_" (var. "ll_") prefix.
  */
@@ -297,10 +293,8 @@ void vvp_global_fini(void)
 	lu_kmem_fini(vvp_caches);
 }
 
-/*****************************************************************************
- *
+/*
  * mirror obd-devices into cl devices.
- *
  */
 
 int cl_sb_init(struct super_block *sb)
diff --git a/fs/lustre/llite/vvp_io.c b/fs/lustre/llite/vvp_io.c
index acc9c2935485..1eb254b2a687 100644
--- a/fs/lustre/llite/vvp_io.c
+++ b/fs/lustre/llite/vvp_io.c
@@ -974,7 +974,7 @@ static int vvp_io_commit_sync(const struct lu_env *env, struct cl_io *io,
  * v5.2-rc4-224-ge01e060fe0
  *
  */
-void vvp_set_pagevec_dirty(struct pagevec *pvec)
+static void vvp_set_pagevec_dirty(struct pagevec *pvec)
 {
 	struct page *page = pvec->pages[0];
 	struct address_space *mapping = page->mapping;
