2008-06-09 22:31:23

by Adrian Bunk

Subject: [2.6 patch] jfs: remove DIRENTSIZ

After fat gets fixed the unused DIRENTSIZ macro was the last user of
struct dirent we should get rid of since the kernel and userspace
versions differed.

Signed-off-by: Adrian Bunk <[email protected]>

---
89432c9b7ff2cd2e29fc5f2edde120dc38a89f46 diff --git a/fs/jfs/jfs_dtree.h b/fs/jfs/jfs_dtree.h
index cdac2d5..2545bb3 100644
--- a/fs/jfs/jfs_dtree.h
+++ b/fs/jfs/jfs_dtree.h
@@ -243,9 +243,6 @@ typedef union {
#define JFS_REMOVE 3
#define JFS_RENAME 4

-#define DIRENTSIZ(namlen) \
- ( (sizeof(struct dirent) - 2*(JFS_NAME_MAX+1) + 2*((namlen)+1) + 3) &~ 3 )
-
/*
* Maximum file offset for directories.
*/

2008-06-10 20:19:18

by Dave Kleikamp

Subject: Re: [2.6 patch] jfs: remove DIRENTSIZ

Ack.

Added to the jfs git tree. As this is an unused macro, removing the
definition of struct dirent shouldn't depend on this patch. Expect it
to make the 2.6.27 merge window.

Thanks,
Shaggy

On Tue, 2008-06-10 at 01:27 +0300, Adrian Bunk wrote:
> After fat gets fixed the unused DIRENTSIZ macro was the last user of
> struct dirent we should get rid of since the kernel and userspace
> versions differed.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> 89432c9b7ff2cd2e29fc5f2edde120dc38a89f46 diff --git a/fs/jfs/jfs_dtree.h b/fs/jfs/jfs_dtree.h
> index cdac2d5..2545bb3 100644
> --- a/fs/jfs/jfs_dtree.h
> +++ b/fs/jfs/jfs_dtree.h
> @@ -243,9 +243,6 @@ typedef union {
> #define JFS_REMOVE 3
> #define JFS_RENAME 4
>
> -#define DIRENTSIZ(namlen) \
> - ( (sizeof(struct dirent) - 2*(JFS_NAME_MAX+1) + 2*((namlen)+1) + 3) &~ 3 )
> -
> /*
> * Maximum file offset for directories.
> */
>
--
David Kleikamp
IBM Linux Technology Center