On 5/15/20 10:33 AM, Trond Myklebust wrote: > On Fri, 2020-05-15 at 10:27 -0700, Randy Dunlap wrote: >> From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> >> >> Fix multiple build errors when CONFIG_NFS_V4 is not enabled. >> >> ../fs/nfs/fsinfo.c: In function 'nfs_fsinfo_get_supports': >> ../fs/nfs/fsinfo.c:153:12: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if (server->attr_bitmask[0] & FATTR4_WORD0_SIZE) >> ^~ >> ../fs/nfs/fsinfo.c:155:12: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if (server->attr_bitmask[1] & FATTR4_WORD1_NUMLINKS) >> ^~ >> ../fs/nfs/fsinfo.c:158:12: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if (server->attr_bitmask[0] & FATTR4_WORD0_ARCHIVE) >> ^~ >> ../fs/nfs/fsinfo.c:160:12: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if (server->attr_bitmask[0] & FATTR4_WORD0_HIDDEN) >> ^~ >> ../fs/nfs/fsinfo.c:162:12: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if (server->attr_bitmask[1] & FATTR4_WORD1_SYSTEM) >> ^~ >> ../fs/nfs/fsinfo.c: In function 'nfs_fsinfo_get_features': >> ../fs/nfs/fsinfo.c:205:12: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if (server->attr_bitmask[0] & FATTR4_WORD0_CASE_INSENSITIVE) >> ^~ >> ../fs/nfs/fsinfo.c:207:13: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> if ((server->attr_bitmask[0] & FATTR4_WORD0_ARCHIVE) || >> ^~ >> ../fs/nfs/fsinfo.c:208:13: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> (server->attr_bitmask[0] & FATTR4_WORD0_HIDDEN) || >> ^~ >> ../fs/nfs/fsinfo.c:209:13: error: 'const struct nfs_server' has no >> member named 'attr_bitmask' >> (server->attr_bitmask[1] & FATTR4_WORD1_SYSTEM)) >> ^~ >> >> >> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> >> Cc: linux-nfs@xxxxxxxxxxxxxxx >> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> >> Cc: Anna Schumaker <anna.schumaker@xxxxxxxxxx> >> Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> >> Cc: linux-fsdevel@xxxxxxxxxxxxxxx >> Cc: David Howells <dhowells@xxxxxxxxxx> >> --- >> fs/nfs/fsinfo.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> --- linux-next-20200515.orig/fs/nfs/fsinfo.c >> +++ linux-next-20200515/fs/nfs/fsinfo.c >> @@ -5,6 +5,7 @@ >> * Written by David Howells (dhowells@xxxxxxxxxx) >> */ >> >> +#include <linux/kconfig.h> >> #include <linux/nfs_fs.h> >> #include <linux/windows.h> >> #include "internal.h" >> @@ -150,6 +151,7 @@ static int nfs_fsinfo_get_supports(struc >> sup->stx_mask |= STATX_CTIME; >> if (server->caps & NFS_CAP_MTIME) >> sup->stx_mask |= STATX_MTIME; >> +#if IS_ENABLED(CONFIG_NFS_V4) >> if (server->attr_bitmask[0] & FATTR4_WORD0_SIZE) >> sup->stx_mask |= STATX_SIZE; >> if (server->attr_bitmask[1] & FATTR4_WORD1_NUMLINKS) >> @@ -161,6 +163,7 @@ static int nfs_fsinfo_get_supports(struc >> sup->win_file_attrs |= ATTR_HIDDEN; >> if (server->attr_bitmask[1] & FATTR4_WORD1_SYSTEM) >> sup->win_file_attrs |= ATTR_SYSTEM; >> +#endif >> >> sup->stx_attributes = STATX_ATTR_AUTOMOUNT; >> return sizeof(*sup); >> @@ -202,12 +205,14 @@ static int nfs_fsinfo_get_features(struc >> if (server->caps & NFS_CAP_MTIME) >> fsinfo_set_feature(ft, FSINFO_FEAT_HAS_MTIME); >> >> +#if IS_ENABLED(CONFIG_NFS_V4) >> if (server->attr_bitmask[0] & FATTR4_WORD0_CASE_INSENSITIVE) >> fsinfo_set_feature(ft, FSINFO_FEAT_NAME_CASE_INDEP); >> if ((server->attr_bitmask[0] & FATTR4_WORD0_ARCHIVE) || >> (server->attr_bitmask[0] & FATTR4_WORD0_HIDDEN) || >> (server->attr_bitmask[1] & FATTR4_WORD1_SYSTEM)) >> fsinfo_set_feature(ft, FSINFO_FEAT_WINDOWS_ATTRS); >> +#endif >> >> return sizeof(*ft); >> } > > This whole thing needs to be reviewed and acked by the NFS community, Certainly. > and quite frankly I'm inclined to NAK this. This is the second time > David tries to push this unwanted rewrite of totally unrelated code. No problem on that. I just want it to build cleanly. thanks. -- ~Randy
