diff mbox

[v2,27/27] xfsprogs: Clean up old parent pointer definitions

Message ID 1528607272-11122-28-git-send-email-allison.henderson@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

Allison Henderson June 10, 2018, 5:07 a.m. UTC
Existing parent pointer stubs and structs are not used in this
implementation.  Remove uneeded definitions.

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
 include/parent.h   | 10 ----------
 libhandle/handle.c | 26 --------------------------
 libhandle/jdm.c    | 20 --------------------
 3 files changed, 56 deletions(-)

Comments

Darrick J. Wong June 11, 2018, 6:20 p.m. UTC | #1
On Sat, Jun 09, 2018 at 10:07:52PM -0700, Allison Henderson wrote:
> Existing parent pointer stubs and structs are not used in this
> implementation.  Remove uneeded definitions.
> 
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> ---
>  include/parent.h   | 10 ----------
>  libhandle/handle.c | 26 --------------------------
>  libhandle/jdm.c    | 20 --------------------
>  3 files changed, 56 deletions(-)
> 
> diff --git a/include/parent.h b/include/parent.h
> index 33f8d85..5665d64 100644
> --- a/include/parent.h
> +++ b/include/parent.h
> @@ -18,16 +18,6 @@
>  #ifndef __PARENT_H__
>  #define	__PARENT_H__
>  
> -typedef struct parent {
> -	__u64	p_ino;
> -	__u32	p_gen;
> -	__u16	p_reclen;
> -} parent_t;
> -
> -typedef struct parent_cursor {
> -	__u32	opaque[4];      /* an opaque cookie */
> -} parent_cursor_t;
> -
>  struct path_list;
>  
>  typedef int (*walk_pptr_fn)(struct xfs_pptr_info *pi, struct xfs_parent_ptr *pptr,
> diff --git a/libhandle/handle.c b/libhandle/handle.c
> index a70fa32..862b943 100644
> --- a/libhandle/handle.c
> +++ b/libhandle/handle.c
> @@ -20,7 +20,6 @@
>  #include "platform_defs.h"
>  #include "xfs.h"
>  #include "handle.h"
> -#include "parent.h"
>  
>  /* just pick a value we know is more than big enough */
>  #define	MAXHANSIZ	64
> @@ -422,31 +421,6 @@ attr_list_by_handle(
>  }
>  
>  int
> -parents_by_handle(
> -	void		*hanp,
> -	size_t		hlen,
> -	parent_t	*buf,
> -	size_t		bufsiz,
> -	unsigned int	*count)
> -
> -{
> -	errno = EOPNOTSUPP;
> -	return -1;
> -}

You probably need to scrape the declarations out of the header files
because otherwise any program that thinks it wants to use this will
compile ok but barf on unresolved symbols in the linker phase.

There's a murkier question here about how do we handle deprecating these
libhandle APIs that have never been usable on Linux?

--D

> -
> -int
> -parentpaths_by_handle(
> -	void		*hanp,
> -	size_t		hlen,
> -	parent_t	*buf,
> -	size_t		bufsiz,
> -	unsigned int	*count)
> -{
> -	errno = EOPNOTSUPP;
> -	return -1;
> -}
> -
> -int
>  fssetdm_by_handle(
>  	void		*hanp,
>  	size_t		hlen,
> diff --git a/libhandle/jdm.c b/libhandle/jdm.c
> index 821061b..0c2440b 100644
> --- a/libhandle/jdm.c
> +++ b/libhandle/jdm.c
> @@ -20,7 +20,6 @@
>  #include "xfs.h"
>  #include "handle.h"
>  #include "jdm.h"
> -#include "parent.h"
>  
>  /* internal fshandle - typecast to a void for external use */
>  #define FSHANDLE_SZ		8
> @@ -178,22 +177,3 @@ jdm_attr_list(	jdm_fshandle_t *fshp,
>  	return rval;
>  }
>  
> -int
> -jdm_parents( jdm_fshandle_t *fshp,
> -		xfs_bstat_t *statp,
> -		parent_t *bufp, size_t bufsz,
> -		unsigned int *count)
> -{
> -	errno = EOPNOTSUPP;
> -	return -1;
> -}
> -
> -int
> -jdm_parentpaths( jdm_fshandle_t *fshp,
> -		xfs_bstat_t *statp,
> -		parent_t *bufp, size_t bufsz,
> -		unsigned int *count)
> -{
> -	errno = EOPNOTSUPP;
> -	return -1;
> -}
> -- 
> 2.7.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Allison Henderson June 11, 2018, 8:06 p.m. UTC | #2
On 06/11/2018 11:20 AM, Darrick J. Wong wrote:
> On Sat, Jun 09, 2018 at 10:07:52PM -0700, Allison Henderson wrote:
>> Existing parent pointer stubs and structs are not used in this
>> implementation.  Remove uneeded definitions.
>>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>> ---
>>   include/parent.h   | 10 ----------
>>   libhandle/handle.c | 26 --------------------------
>>   libhandle/jdm.c    | 20 --------------------
>>   3 files changed, 56 deletions(-)
>>
>> diff --git a/include/parent.h b/include/parent.h
>> index 33f8d85..5665d64 100644
>> --- a/include/parent.h
>> +++ b/include/parent.h
>> @@ -18,16 +18,6 @@
>>   #ifndef __PARENT_H__
>>   #define	__PARENT_H__
>>   
>> -typedef struct parent {
>> -	__u64	p_ino;
>> -	__u32	p_gen;
>> -	__u16	p_reclen;
>> -} parent_t;
>> -
>> -typedef struct parent_cursor {
>> -	__u32	opaque[4];      /* an opaque cookie */
>> -} parent_cursor_t;
>> -
>>   struct path_list;
>>   
>>   typedef int (*walk_pptr_fn)(struct xfs_pptr_info *pi, struct xfs_parent_ptr *pptr,
>> diff --git a/libhandle/handle.c b/libhandle/handle.c
>> index a70fa32..862b943 100644
>> --- a/libhandle/handle.c
>> +++ b/libhandle/handle.c
>> @@ -20,7 +20,6 @@
>>   #include "platform_defs.h"
>>   #include "xfs.h"
>>   #include "handle.h"
>> -#include "parent.h"
>>   
>>   /* just pick a value we know is more than big enough */
>>   #define	MAXHANSIZ	64
>> @@ -422,31 +421,6 @@ attr_list_by_handle(
>>   }
>>   
>>   int
>> -parents_by_handle(
>> -	void		*hanp,
>> -	size_t		hlen,
>> -	parent_t	*buf,
>> -	size_t		bufsiz,
>> -	unsigned int	*count)
>> -
>> -{
>> -	errno = EOPNOTSUPP;
>> -	return -1;
>> -}
> 
> You probably need to scrape the declarations out of the header files
> because otherwise any program that thinks it wants to use this will
> compile ok but barf on unresolved symbols in the linker phase.
> 
> There's a murkier question here about how do we handle deprecating these
> libhandle APIs that have never been usable on Linux?
> 
> --D
Oh I see... is there a formal procedure for deprecation that we need to 
be following?  In case someone was depending on getting their EOPNOTSUPP rc?

> 
>> -
>> -int
>> -parentpaths_by_handle(
>> -	void		*hanp,
>> -	size_t		hlen,
>> -	parent_t	*buf,
>> -	size_t		bufsiz,
>> -	unsigned int	*count)
>> -{
>> -	errno = EOPNOTSUPP;
>> -	return -1;
>> -}
>> -
>> -int
>>   fssetdm_by_handle(
>>   	void		*hanp,
>>   	size_t		hlen,
>> diff --git a/libhandle/jdm.c b/libhandle/jdm.c
>> index 821061b..0c2440b 100644
>> --- a/libhandle/jdm.c
>> +++ b/libhandle/jdm.c
>> @@ -20,7 +20,6 @@
>>   #include "xfs.h"
>>   #include "handle.h"
>>   #include "jdm.h"
>> -#include "parent.h"
>>   
>>   /* internal fshandle - typecast to a void for external use */
>>   #define FSHANDLE_SZ		8
>> @@ -178,22 +177,3 @@ jdm_attr_list(	jdm_fshandle_t *fshp,
>>   	return rval;
>>   }
>>   
>> -int
>> -jdm_parents( jdm_fshandle_t *fshp,
>> -		xfs_bstat_t *statp,
>> -		parent_t *bufp, size_t bufsz,
>> -		unsigned int *count)
>> -{
>> -	errno = EOPNOTSUPP;
>> -	return -1;
>> -}
>> -
>> -int
>> -jdm_parentpaths( jdm_fshandle_t *fshp,
>> -		xfs_bstat_t *statp,
>> -		parent_t *bufp, size_t bufsz,
>> -		unsigned int *count)
>> -{
>> -	errno = EOPNOTSUPP;
>> -	return -1;
>> -}
>> -- 
>> 2.7.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/parent.h b/include/parent.h
index 33f8d85..5665d64 100644
--- a/include/parent.h
+++ b/include/parent.h
@@ -18,16 +18,6 @@ 
 #ifndef __PARENT_H__
 #define	__PARENT_H__
 
-typedef struct parent {
-	__u64	p_ino;
-	__u32	p_gen;
-	__u16	p_reclen;
-} parent_t;
-
-typedef struct parent_cursor {
-	__u32	opaque[4];      /* an opaque cookie */
-} parent_cursor_t;
-
 struct path_list;
 
 typedef int (*walk_pptr_fn)(struct xfs_pptr_info *pi, struct xfs_parent_ptr *pptr,
diff --git a/libhandle/handle.c b/libhandle/handle.c
index a70fa32..862b943 100644
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -20,7 +20,6 @@ 
 #include "platform_defs.h"
 #include "xfs.h"
 #include "handle.h"
-#include "parent.h"
 
 /* just pick a value we know is more than big enough */
 #define	MAXHANSIZ	64
@@ -422,31 +421,6 @@  attr_list_by_handle(
 }
 
 int
-parents_by_handle(
-	void		*hanp,
-	size_t		hlen,
-	parent_t	*buf,
-	size_t		bufsiz,
-	unsigned int	*count)
-
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}
-
-int
-parentpaths_by_handle(
-	void		*hanp,
-	size_t		hlen,
-	parent_t	*buf,
-	size_t		bufsiz,
-	unsigned int	*count)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}
-
-int
 fssetdm_by_handle(
 	void		*hanp,
 	size_t		hlen,
diff --git a/libhandle/jdm.c b/libhandle/jdm.c
index 821061b..0c2440b 100644
--- a/libhandle/jdm.c
+++ b/libhandle/jdm.c
@@ -20,7 +20,6 @@ 
 #include "xfs.h"
 #include "handle.h"
 #include "jdm.h"
-#include "parent.h"
 
 /* internal fshandle - typecast to a void for external use */
 #define FSHANDLE_SZ		8
@@ -178,22 +177,3 @@  jdm_attr_list(	jdm_fshandle_t *fshp,
 	return rval;
 }
 
-int
-jdm_parents( jdm_fshandle_t *fshp,
-		xfs_bstat_t *statp,
-		parent_t *bufp, size_t bufsz,
-		unsigned int *count)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}
-
-int
-jdm_parentpaths( jdm_fshandle_t *fshp,
-		xfs_bstat_t *statp,
-		parent_t *bufp, size_t bufsz,
-		unsigned int *count)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}