staging/lustre/libcfs: Fix build errors for !CONFIG_SMP
PATCH 1/3 staging/lustre/libcfs: Fix build errors for !CONFIG_SMP
When CONFIG_SMP=n:
drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:58:31: fatal error: libcfs/libcfs_cpu.h: No such file or directory
drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c:78:1: error: redefinition of 'cfs_cpt_table_print' drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h:109:1: note: previous definition of 'cfs_cpt_table_print' was here
---
http://kisskb.ellerman.id.au/kisskb/buildresult/11054360/
--- .../lustre/include/linux/libcfs/linux/linux-mem.h | 2 +- drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +1 -1
@@ -55,7 +55,7 @@#ifndef HAVE_LIBCFS_CPT /* Need this for cfs_cpt_table */ -#include <libcfs/libcfs_cpu.h> +#include <linux/libcfs/libcfs_cpu.h> #endif #define CFS_PAGE_MASK (~((__u64)PAGE_CACHE_SIZE-1))
drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c +2 -0
@@ -74,6 +74,7 @@ cfs_cpt_table_free(struct cfs_cpt_table *cptab) }EXPORT_SYMBOL (cfs_cpt_table_free); +#ifdef CONFIG_SMP int cfs_cpt_table_print (struct cfs_cpt_table *cptab,char *buf,int len) {
@@ -87,6 +88,7 @@ cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len) return rc; }EXPORT_SYMBOL (cfs_cpt_table_print); +#endif /* CONFIG_SMP */ int cfs_cpt_number (struct cfs_cpt_table *cptab)
Signature · 1 line
1.7.9.5
PATCH 2/3 staging: lustre: Use %zd to format ssize_t
drivers/staging/lustre/lustre/llite/rw26.c: In function 'll_direct_IO_26':drivers/staging/lustre/lustre/llite/rw26.c:383:2: warning: format '%lu' expects argument of type 'long unsigned int', but argument 6 has type 'ssize_t' [-Wformat] drivers/staging/lustre/lustre/llite/rw26.c:383:2: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'ssize_t' [-Wformat]
Join the quoted string split across lines to fix a checkpatch warning while we're at it.
--- drivers/staging/lustre/lustre/llite/rw26.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/lustre/lustre/llite/rw26.c +2 -2
@@ -380,8 +380,8 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,if ((file_offset & ~CFS_PAGE_MASK ) || (count & ~CFS_PAGE_MASK ))return -EINVAL ; -CDEBUG (D_VFSTRACE ,"VFS Op:inode=%lu/%u(%p), size=%lu (max %lu), " -"offset=%lld=%llx, pages %lu (max %lu)\n" , +CDEBUG (D_VFSTRACE , +"VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n" , inode->i_ino, inode->i_generation, inode, count,MAX_DIO_SIZE , file_offset, file_offset, count >>PAGE_CACHE_SHIFT ,MAX_DIO_SIZE >>PAGE_CACHE_SHIFT );
Signature · 1 line
1.7.9.5
PATCH 3/3 staging/lustre/llite: Fix unused variable warning if !CONFIG_FS_POSIX_ACL
In reply to Geert UytterhoevenIf CONFIG_FS_POSIX_ACL=n:
drivers/staging/lustre/lustre/llite/xattr.c: In function 'll_setxattr_common':drivers/staging/lustre/lustre/llite/xattr.c:115:27: warning: unused variable 'rce' [-Wunused-variable]
--- drivers/staging/lustre/lustre/llite/xattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/lustre/lustre/llite/xattr.c +1 -1
@@ -112,8 +112,8 @@ int ll_setxattr_common(struct inode *inode, const char *name,struct ptlrpc_request *req =NULL ;int xattr_type, rc;struct obd_capa *oc; -struct rmtacl_ctl_entry *rce =NULL ;#ifdef CONFIG_FS_POSIX_ACL +struct rmtacl_ctl_entry *rce =NULL ;posix_acl_xattr_header *new_value =NULL ;ext_acl_xattr_header *acl =NULL ;#endif
Signature · 1 line
1.7.9.5