The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-693.1.1.vz7.37.2 ------> commit 5ce3e1be78f85902e8606e77a1883248dbc5ea6e Author: Konstantin Khorenko <khore...@virtuozzo.com> Date: Tue Sep 5 15:24:34 2017 +0300
ve/autofs: drop redundant hunks of 71-diff-autofs-combined Fixes: 078889e ("VE/AUTOFS: port 71-diff-autofs-combined") Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com> --- fs/autofs4/autofs_i.h | 1 - fs/autofs4/inode.c | 1 - 2 files changed, 2 deletions(-) diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index e105f59..7e44fa7 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -119,7 +119,6 @@ struct autofs_sb_info { struct list_head active_list; struct list_head expiring_list; struct rcu_head rcu; - unsigned is32bit:1; }; static inline struct autofs_sb_info *autofs4_sbi(struct super_block *sb) diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 0af786c..175ae8a 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -338,7 +338,6 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) fail_fput: pr_err("pipe file descriptor does not contain proper ops\n"); fput(pipe); - /* fall through */ fail_put_pid: put_pid(sbi->oz_pgrp); fail_dput: _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel