Unverified Commit b5504db0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13879 Fix problems of mounting nfs 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AVXVUEZP7RNJ3YYFDSTMSIK5ITEM2L4D/ 
Li Lingfeng (2):
  nfs: pass flags to second superblock
  nfs: ignore SB_RDONLY when mounting nfs


-- 
2.31.1
 
https://gitee.com/openeuler/kernel/issues/IB42W1 
 
Link:https://gitee.com/openeuler/kernel/pulls/13879

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 897ce607 ed901d64

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/nfs_page.h>

#include <linux/wait_bit.h>



#define NFS_MS_MASK (SB_RDONLY|SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)

#define NFS_MS_MASK (SB_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)



extern const struct export_operations nfs_export_ops;

fs/nfs/nfs4super.c

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, 


	res = nfs_follow_remote_path(root_mnt, export_path);



	if (!IS_ERR(res))

		res->d_sb->s_flags = flags;

	dfprintk(MOUNT, "<-- nfs4_try_mount() = %d%s\n",

		 PTR_ERR_OR_ZERO(res),

		 IS_ERR(res) ? " [error]" : "");