new helper: dump_align()

[linux-2.6-block.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index c56ae3264a651777beaf396386b97c98cfd95622..864154972670520f06d228db2e6f2b746cd13186 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1225,12 +1225,6 @@ static int notesize(struct memelfnote *en)
        return sz;
 }
 
-static int alignfile(struct coredump_params *cprm)
-{
-       static const char buf[4] = { 0, };
-       return dump_emit(cprm, buf, roundup(cprm->written, 4) - cprm->written);
-}
-
 static int writenote(struct memelfnote *men, struct coredump_params *cprm)
 {
        struct elf_note en;
@@ -1239,8 +1233,8 @@ static int writenote(struct memelfnote *men, struct coredump_params *cprm)
        en.n_type = men->type;
 
        return dump_emit(cprm, &en, sizeof(en)) &&
-           dump_emit(cprm, men->name, en.n_namesz) && alignfile(cprm) &&
-           dump_emit(cprm, men->data, men->datasz) && alignfile(cprm);
+           dump_emit(cprm, men->name, en.n_namesz) && dump_align(cprm, 4) &&
+           dump_emit(cprm, men->data, men->datasz) && dump_align(cprm, 4);
 }
 
 static void fill_elf_header(struct elfhdr *elf, int segs,