From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 4/7] VFS: Propagate mnt_flags into do_loopback Date: Wed, 23 Dec 2009 15:37:00 -0800 Message-ID: <1261611423-4396-5-git-send-email-vaurora@redhat.com> References: <1261611423-4396-1-git-send-email-vaurora@redhat.com> <1261611423-4396-2-git-send-email-vaurora@redhat.com> <1261611423-4396-3-git-send-email-vaurora@redhat.com> <1261611423-4396-4-git-send-email-vaurora@redhat.com> Cc: Jan Blunck , Alexander Viro , Valerie Aurora To: linux-fsdevel@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:60233 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756366AbZLWXg5 (ORCPT ); Wed, 23 Dec 2009 18:36:57 -0500 In-Reply-To: <1261611423-4396-4-git-send-email-vaurora@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Jan Blunck The mnt_flags are propagated into do_loopback(), so that they can be checked when mounting something loopback into a union. Signed-off-by: Jan Blunck Signed-off-by: Valerie Aurora Cc: Alexander Viro --- fs/namespace.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index bdc3cb4..2244801 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1446,8 +1446,8 @@ static int do_change_type(struct path *path, int flag) /* * do loopback mount. */ -static int do_loopback(struct path *path, char *old_name, - int recurse) +static int do_loopback(struct path *path, char *old_name, int recurse, + int mnt_flags) { struct path old_path; struct vfsmount *mnt = NULL; @@ -1959,7 +1959,8 @@ long do_mount(char *dev_name, char *dir_name, char *type_page, retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); else if (flags & MS_BIND) - retval = do_loopback(&path, dev_name, flags & MS_REC); + retval = do_loopback(&path, dev_name, flags & MS_REC, + mnt_flags); else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) retval = do_change_type(&path, flags); else if (flags & MS_MOVE) -- 1.5.6.5