X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fofd%2Fofd_fs.c;h=25b82f5da7743b948fa5f8a6a9406211c1df3ee9;hb=83ddd179225821e5c2aee1adb72dab26150ab385;hp=f20617be45483eb5310e27775fb4aece7355b04d;hpb=4485ee8be4cf224e2543f6344efc6e1cb295a0a7;p=fs%2Flustre-release.git diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c index f20617b..25b82f5 100644 --- a/lustre/ofd/ofd_fs.c +++ b/lustre/ofd/ofd_fs.c @@ -27,7 +27,6 @@ */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. * * lustre/ofd/ofd_fs.c * @@ -310,18 +309,17 @@ static void ofd_fld_fini(const struct lu_env *env, struct ofd_device *ofd) */ void ofd_seqs_free(const struct lu_env *env, struct ofd_device *ofd) { - struct ofd_seq *oseq; - struct ofd_seq *tmp; - struct list_head dispose; + struct ofd_seq *oseq; + struct ofd_seq *tmp; + LIST_HEAD(dispose); - INIT_LIST_HEAD(&dispose); write_lock(&ofd->ofd_seq_list_lock); list_for_each_entry_safe(oseq, tmp, &ofd->ofd_seq_list, os_list) list_move(&oseq->os_list, &dispose); write_unlock(&ofd->ofd_seq_list_lock); while (!list_empty(&dispose)) { - oseq = container_of0(dispose.next, struct ofd_seq, os_list); + oseq = container_of(dispose.next, struct ofd_seq, os_list); list_del_init(&oseq->os_list); ofd_seq_put(env, oseq); }