Theodore Ts'o
97d26ce9e3
Merge branch 'maint' into next
...
Conflicts:
e2fsck/journal.c
e2fsck/pass1.c
e2fsck/pass2.c
misc/mke2fs.c
2010-06-07 12:42:40 -04:00
Theodore Ts'o
effb344241
libext2fs: Remove #include of <linux/types.h> from fiemap.h
...
The system header file can end up causing type conflicts, and
including kernel header files is always dodgy/dangerous (and this case
not needed).
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-05-31 18:50:50 -04:00
Theodore Ts'o
88fca201ac
Move declaration of FS_IOC_FIEMAP ioctl to fiemap.h
...
This helps e4defrag compile on systems where the system header files
don't yet define FS_IOC_FIEMAP.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-08-22 13:16:14 -04:00
Theodore Ts'o
5fdb89e30e
Add missing file: lib/ext2fs/fiemap.h
...
This file is needed so the updated filefrag program will compile. I
missed a "git add"; oops.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-05-04 07:39:56 -04:00