drop linux/ufs_fs.h from userspace export

PATCH In review Mike Frysinger 3 participants 7 messages Jan 26, 2008 – Jan 28, 2008

Share & tools

Mike Frysinger

author

2008-01-26 09:10 UTC #0 lore raw

PATCH 1/1 drop linux/ufs_fs.h from userspace export

Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header.

Signed-off-by Mike Frysinger <[email protected]>

---
 include/linux/Kbuild   |    1 -
 include/linux/ufs_fs.h |    6 ------
 2 files changed, 0 insertions(+), 7 deletions(-)

include/linux/Kbuild +0 -1

index bd694f7..4076575 100644
@@ -337,7 +337,6 @@ unifdef-y += tty.h
 unifdef-y += types.h
 unifdef-y += udf_fs_i.h
 unifdef-y += udp.h
-unifdef-y += ufs_fs.h
 unifdef-y += uinput.h
 unifdef-y += uio.h
 unifdef-y += unistd.h

include/linux/ufs_fs.h +0 -6

index 10b854d..46e4a8d 100644
@@ -35,16 +35,10 @@
 #include <linux/stat.h>
 #include <linux/fs.h>
 
-#ifndef __KERNEL__
-typedef __u64 __fs64;
-typedef __u32 __fs32;
-typedef __u16 __fs16;
-#else
 #include <asm/div64.h>
 typedef __u64 __bitwise __fs64;
 typedef __u32 __bitwise __fs32;
 typedef __u16 __bitwise __fs16;
-#endif
 
 #define UFS_BBLOCK 0
 #define UFS_BBSIZE 8192

Signature · 1 line

1.5.3.8

Christoph Hellwig

2008-01-26 20:23 UTC #1 lore raw

Quoted 3 lines · Mike Frysinger

Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header.

Thanks! Care to move it to fs/ufs/ while you're at it?

Mike Frysinger

author

2008-01-26 21:17 UTC #2 lore raw

Quoted 6 lines · Christoph Hellwig

Quoted 3 lines · Mike Frysinger
Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header.
Thanks! Care to move it to fs/ufs/ while you're at it?

sure, i'll send a patch to apply after this one
-mike

Andrew Morton

2008-01-28 05:35 UTC #3 lore raw

In reply to Mike Frysinger

Quoted 4 lines · On Sat, 26 Jan 2008 04:09:52 -0500 Mike Frysinger <[email protected]> wrote:

Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header.

This patch is incompatible with your "Relocate linux/ufs_fs.h to fs/ufs/ufs_fs.h". I'll drop both.

Mike Frysinger

author

2008-01-28 07:42 UTC #4 lore raw

PATCH 1/1 drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h

Quoted 7 lines · Andrew Morton

Quoted 3 lines · On Sat, 26 Jan 2008 04:09:52 -0500 Mike Frysinger <[email protected]> wrote:
Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header.
This patch is incompatible with your "Relocate linux/ufs_fs.h to fs/ufs/ufs_fs.h". I'll drop both.

blah, you're right. combo patch here we come.
---
Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header. This allows use to move it completely from include/linux/ to fs/ufs/ seeing as how the only in-kernel consumer is fs/ufs/.

Signed-off-by Mike Frysinger <[email protected]>

---
 b/fs/ufs/balloc.c      |    2 
 b/fs/ufs/cylinder.c    |    2 
 b/fs/ufs/dir.c         |    2 
 b/fs/ufs/file.c        |    2 
 b/fs/ufs/ialloc.c      |    2 
 b/fs/ufs/inode.c       |    2 
 b/fs/ufs/namei.c       |    3 
 b/fs/ufs/super.c       |    2 
 b/fs/ufs/symlink.c     |    3 
 b/fs/ufs/truncate.c    |    2 
 b/fs/ufs/ufs_fs.h      |  947 ++++++++++++++++++++++++++++++++++++++++++++++++
 b/fs/ufs/util.c        |    2 
 b/include/linux/Kbuild |    1 
 include/linux/ufs_fs.h |  953 -------------------------------------------------
 14 files changed, 960 insertions(+), 965 deletions(-)

fs/ufs/balloc.c +1 -1

index f63a09c..1fca381 100644
@@ -9,7 +9,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/stat.h>
 #include <linux/time.h>
 #include <linux/string.h>

@@ -19,6 +18,7 @@
 #include <linux/bitops.h>
 #include <asm/byteorder.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/cylinder.c +1 -1

index 2a81566..b467632 100644
@@ -9,7 +9,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>

@@ -17,6 +16,7 @@
 
 #include <asm/byteorder.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/dir.c +1 -1

index aaf2878..ef563fc 100644
@@ -18,9 +18,9 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/swap.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/file.c +1 -1

index a46c97b..625ef17 100644
@@ -24,9 +24,9 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/buffer_head.h>	/* for sync_mapping_buffers() */
 
+#include "ufs_fs.h"
 #include "ufs.h"

fs/ufs/ialloc.c +1 -1

index 7e260bc..ac181f6 100644
@@ -24,7 +24,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>

@@ -34,6 +33,7 @@
 #include <linux/bitops.h>
 #include <asm/byteorder.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/inode.c +1 -1

index 4320782..ee8bbef 100644
@@ -30,7 +30,6 @@
 
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>

@@ -38,6 +37,7 @@
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/namei.c +2 -1

index d8bfbee..ae1400f 100644
@@ -29,8 +29,9 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/smp_lock.h>
+
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "util.h"

fs/ufs/super.c +1 -1

index 0072cb3..72beb78 100644
@@ -76,7 +76,6 @@
 
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/stat.h>

@@ -91,6 +90,7 @@
 #include <linux/mount.h>
 #include <linux/seq_file.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/symlink.c +2 -1

index 43ac10e..c0156ed 100644
@@ -27,7 +27,8 @@
 
 #include <linux/fs.h>
 #include <linux/namei.h>
-#include <linux/ufs_fs.h>
+
+#include "ufs_fs.h"
 #include "ufs.h"

fs/ufs/truncate.c +1 -1

index 311ded3..41dd431 100644
@@ -36,7 +36,6 @@
 
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 #include <linux/fcntl.h>
 #include <linux/time.h>
 #include <linux/stat.h>

@@ -46,6 +45,7 @@
 #include <linux/blkdev.h>
 #include <linux/sched.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

fs/ufs/ufs_fs.h new file +947 -0

947 lines not on this page · raw message

fs/ufs/util.c +1 -1

index 410084d..85a7fc9 100644
@@ -8,9 +8,9 @@
  
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/ufs_fs.h>
 #include <linux/buffer_head.h>
 
+#include "ufs_fs.h"
 #include "ufs.h"
 #include "swab.h"
 #include "util.h"

include/linux/Kbuild +0 -1

index bd694f7..4076575 100644
@@ -337,7 +337,6 @@ unifdef-y += tty.h
 unifdef-y += types.h
 unifdef-y += udf_fs_i.h
 unifdef-y += udp.h
-unifdef-y += ufs_fs.h
 unifdef-y += uinput.h
 unifdef-y += uio.h
 unifdef-y += unistd.h

include/linux/ufs_fs.h deleted +0 ~~-953~~

953 lines not on this page · raw message

Andrew Morton

2008-01-28 09:18 UTC #5 lore raw

Re: [patch] drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h

Quoted 7 lines · On Mon, 28 Jan 2008 02:41:51 -0500 Mike Frysinger <[email protected]> wrote:

blah, you're right. combo patch here we come.
---
Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header. This allows use to move it completely from include/linux/ to fs/ufs/ seeing as how the only in-kernel consumer is fs/ufs/.

I see you're not a big fan of scripts/checkpatch.pl.

Mike Frysinger

author

2008-01-28 09:58 UTC #6 lore raw

Re: [patch] drop linux/ufs_fs.h from userspace export and relocate it to fs/ufs/ufs_fs.h

Quoted 10 lines · Andrew Morton

Quoted 7 lines · On Mon, 28 Jan 2008 02:41:51 -0500 Mike Frysinger <[email protected]> wrote:
blah, you're right. combo patch here we come.
---
Per previous discussions about cleaning up ufs_fs.h, people just want this straight up dropped from userspace export. The only remaining consumer (silo) has been fixed a while ago to not rely on this header. This allows use to move it completely from include/linux/ to fs/ufs/ seeing as how the only in-kernel consumer is fs/ufs/.
I see you're not a big fan of scripts/checkpatch.pl.

i'm a big fan of doing what i need to do and getting the hell out ;)

in this case:
mv include/linux/ufs_fs.h fs/ufs/
git rm include/linux/ufs_fs.h
git add fs/ufs/ufs_fs.h

if the ufs_fs.h threw complaints from checkpatch.pl, it did so originally before i touched it, and i leave it up to the maintainer and/or someone who wants to look at it.
-mike