* [PATCH 1/3] staging/lustre/libcfs: Fix build errors for !CONFIG_SMP
@ 2014-05-02 16:28 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-05-02 16:28 UTC (permalink / raw
To: Greg Kroah-Hartman, Oleg Drokin
Cc: devel, linux-fsdevel, linux-kernel, Geert Uytterhoeven
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
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
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(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
index 72c76ad96ce9..ccee5c3e4142 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
@@ -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))
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
index d985e83ba2c3..a1a7bf44cccf 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
@@ -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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/3] staging/lustre/libcfs: Fix build errors for !CONFIG_SMP
@ 2014-05-02 16:28 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-05-02 16:28 UTC (permalink / raw
To: Greg Kroah-Hartman, Oleg Drokin
Cc: devel, linux-fsdevel, Geert Uytterhoeven, linux-kernel
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
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
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(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
index 72c76ad96ce9..ccee5c3e4142 100644
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
@@ -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))
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
index d985e83ba2c3..a1a7bf44cccf 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
@@ -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)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] staging: lustre: Use %zd to format ssize_t
2014-05-02 16:28 ` Geert Uytterhoeven
@ 2014-05-02 16:28 ` Geert Uytterhoeven
-1 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-05-02 16:28 UTC (permalink / raw
To: Greg Kroah-Hartman, Oleg Drokin
Cc: devel, linux-fsdevel, linux-kernel, Geert Uytterhoeven
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.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/staging/lustre/lustre/llite/rw26.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index c3fd544b78dc..af84c1aaa5f8 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] staging: lustre: Use %zd to format ssize_t
@ 2014-05-02 16:28 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-05-02 16:28 UTC (permalink / raw
To: Greg Kroah-Hartman, Oleg Drokin
Cc: devel, linux-fsdevel, Geert Uytterhoeven, linux-kernel
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.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/staging/lustre/lustre/llite/rw26.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index c3fd544b78dc..af84c1aaa5f8 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] staging/lustre/llite: Fix unused variable warning if !CONFIG_FS_POSIX_ACL
2014-05-02 16:28 ` Geert Uytterhoeven
@ 2014-05-02 16:28 ` Geert Uytterhoeven
-1 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-05-02 16:28 UTC (permalink / raw
To: Greg Kroah-Hartman, Oleg Drokin
Cc: devel, linux-fsdevel, linux-kernel, Geert Uytterhoeven
If 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]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/staging/lustre/lustre/llite/xattr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 67a1de41c5b2..c6c27bbb43b4 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] staging/lustre/llite: Fix unused variable warning if !CONFIG_FS_POSIX_ACL
@ 2014-05-02 16:28 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2014-05-02 16:28 UTC (permalink / raw
To: Greg Kroah-Hartman, Oleg Drokin
Cc: devel, linux-fsdevel, Geert Uytterhoeven, linux-kernel
If 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]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/staging/lustre/lustre/llite/xattr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c
index 67a1de41c5b2..c6c27bbb43b4 100644
--- a/drivers/staging/lustre/lustre/llite/xattr.c
+++ b/drivers/staging/lustre/lustre/llite/xattr.c
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-02 16:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-02 16:28 [PATCH 1/3] staging/lustre/libcfs: Fix build errors for !CONFIG_SMP Geert Uytterhoeven
2014-05-02 16:28 ` Geert Uytterhoeven
2014-05-02 16:28 ` [PATCH 2/3] staging: lustre: Use %zd to format ssize_t Geert Uytterhoeven
2014-05-02 16:28 ` Geert Uytterhoeven
2014-05-02 16:28 ` [PATCH 3/3] staging/lustre/llite: Fix unused variable warning if !CONFIG_FS_POSIX_ACL Geert Uytterhoeven
2014-05-02 16:28 ` Geert Uytterhoeven
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.