Sync kernel's fix for potential double free in jbd2

[tools/e2fsprogs.git] / debugfs / lsdel.c

diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c
index 0e774a3..c0d5890 100644 (file)
--- a/debugfs/lsdel.c
+++ b/debugfs/lsdel.c
@@ -71,7 +71,8 @@ static int lsdel_proc(ext2_filsys fs,
        return 0;
 }
 
-void do_lsdel(int argc, char **argv)
+void do_lsdel(int argc, char **argv, int sci_idx EXT2FS_ATTR((unused)),
+             void *infop EXT2FS_ATTR((unused)))
 {
        struct lsdel_struct     lsd;
        struct deleted_info     *delarray;
@@ -133,7 +134,7 @@ void do_lsdel(int argc, char **argv)
 
        while (ino) {
                if ((inode.i_dtime == 0) ||
-                   (secs && ((unsigned) abs(now - secs) > inode.i_dtime)))
+                   (secs && (labs(now - secs) > (long) inode.i_dtime)))
                        goto next;
 
                lsd.inode = ino;
@@ -152,7 +153,8 @@ void do_lsdel(int argc, char **argv)
                                goto next;
                        }
                }
-               if (lsd.free_blocks && !lsd.bad_blocks) {
+               if ((lsd.free_blocks && !lsd.bad_blocks) ||
+                   inode.i_flags & EXT4_INLINE_DATA_FL) {
                        if (num_delarray >= max_delarray) {
                                max_delarray += 50;
                                delarray = realloc(delarray,
@@ -169,7 +171,7 @@ void do_lsdel(int argc, char **argv)
                        delarray[num_delarray].mode = inode.i_mode;
                        delarray[num_delarray].uid = inode_uid(inode);
                        delarray[num_delarray].size = EXT2_I_SIZE(&inode);
-                       delarray[num_delarray].dtime = inode.i_dtime;
+                       delarray[num_delarray].dtime = (__s32) inode.i_dtime;
                        delarray[num_delarray].num_blocks = lsd.num_blocks;
                        delarray[num_delarray].free_blocks = lsd.free_blocks;
                        num_delarray++;