Whamcloud - gitweb
LU-13783 procfs: fix improper prop_ops fields
authorJames Simmons <jsimmons@infradead.org>
Thu, 20 Jan 2022 01:47:11 +0000 (17:47 -0800)
committerAndreas Dilger <adilger@whamcloud.com>
Fri, 21 Jan 2022 23:24:54 +0000 (23:24 +0000)
The lod pool and nodemap proc_ops missed renaming the fields to
start with .proc_*. On newer distros like Ubuntu 20.04 HWE you
get the following compile error:

lustre-release/lustre/ptlrpc/nodemap_lproc.c:686:3: error: ‘const struct proc_ops’ has no member named ‘open’
  686 |  .open   = nodemap_ranges_open,

Lustre-change: https://review.whamcloud.com/43880
Lustre-commit: d106dfc1458702865118e73bfcdfc2ec2676a7d6

Test-Parameters: trivial
Fixes: 13cd0f9f667 ("LU-13344 libcfs: Abstract proc_fs with proc_ops")
Signed-off-by: James Simmons <jsimmons@infradead.org>
Change-Id: I5fff7519a801f585690d468255f7ca6c73adcc90
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-on: https://review.whamcloud.com/46219
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
lustre/lod/lod_pool.c
lustre/ptlrpc/nodemap_lproc.c

index 3638adc..599980f 100644 (file)
@@ -319,10 +319,10 @@ static int pool_proc_open(struct inode *inode, struct file *file)
 }
 
 const static struct proc_ops pool_proc_operations = {
-       .open           = pool_proc_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
+       .proc_open      = pool_proc_open,
+       .proc_read      = seq_read,
+       .proc_lseek     = seq_lseek,
+       .proc_release   = seq_release,
 };
 
 /**
index 3594333..295da97 100644 (file)
@@ -734,24 +734,24 @@ LPROC_SEQ_FOPS_RO(nodemap_audit_mode);
 LPROC_SEQ_FOPS_RO(nodemap_forbid_encryption);
 
 static const struct proc_ops nodemap_ranges_fops = {
-       .open                   = nodemap_ranges_open,
-       .read                   = seq_read,
-       .llseek                 = seq_lseek,
-       .release                = single_release
+       .proc_open              = nodemap_ranges_open,
+       .proc_read              = seq_read,
+       .proc_lseek             = seq_lseek,
+       .proc_release           = single_release
 };
 
 static const struct proc_ops nodemap_idmap_fops = {
-       .open                   = nodemap_idmap_open,
-       .read                   = seq_read,
-       .llseek                 = seq_lseek,
-       .release                = single_release
+       .proc_open              = nodemap_idmap_open,
+       .proc_read              = seq_read,
+       .proc_lseek             = seq_lseek,
+       .proc_release           = single_release
 };
 
 static const struct proc_ops nodemap_exports_fops = {
-       .open                   = nodemap_exports_open,
-       .read                   = seq_read,
-       .llseek                 = seq_lseek,
-       .release                = single_release
+       .proc_open              = nodemap_exports_open,
+       .proc_read              = seq_read,
+       .proc_lseek             = seq_lseek,
+       .proc_release           = single_release
 };
 
 static struct lprocfs_vars lprocfs_nodemap_vars[] = {