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

!15193 Roll back the setting of nfs superblock s_flags. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HMO7ZX5RTXEOMLT7EVKMQGFTXO3AFQTW/ 
Roll back the setting of nfs superblock s_flags.

Li Lingfeng (3):
  Revert "nfs: fix the loss of superblock's initialized flags"
  Revert "nfs: pass flags to second superblock"
  Revert "nfs: ignore SB_RDONLY when mounting nfs"


-- 
2.31.1
 
https://gitee.com/openeuler/kernel/issues/IBNEQX 
 
Link:https://gitee.com/openeuler/kernel/pulls/15193

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 33c097cb 654e3aee

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_NOSUID|SB_NODEV|SB_NOEXEC|SB_SYNCHRONOUS)

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



extern const struct export_operations nfs_export_ops;

fs/nfs/nfs4super.c

+0 −2
Original line number Diff line number Diff line
@@ -253,8 +253,6 @@ 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 & SB_RDONLY);

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

		 PTR_ERR_OR_ZERO(res),

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