Hi Frank, I should be able to do that. Thanks Chuck for the fix. On Mon, Nov 6, 2017 at 9:34 AM, Frank Filz <ffilzlnx@xxxxxxxxxxxxxx> wrote: > Pradeep, > > Could you verify this patch with nfs-ganesha? Looking at the code, it looks like we will supply the attributes requested. > > Thanks > > Frank > >> -----Original Message----- >> From: linux-nfs-owner@xxxxxxxxxxxxxxx [mailto:linux-nfs- >> owner@xxxxxxxxxxxxxxx] On Behalf Of Chuck Lever >> Sent: Sunday, November 5, 2017 12:45 PM >> To: trond.myklebust@xxxxxxxxxxxxxxx; anna.schumaker@xxxxxxxxxx >> Cc: linux-nfs@xxxxxxxxxxxxxxx >> Subject: [PATCH v2] nfs: Fix ugly referral attributes >> >> Before traversing a referral and performing a mount, the mounted-on >> directory looks strange: >> >> dr-xr-xr-x. 2 4294967294 4294967294 0 Dec 31 1969 dir.0 >> >> nfs4_get_referral is wiping out any cached attributes with what was returned >> via GETATTR(fs_locations), but the bit mask for that operation does not >> request any file attributes. >> >> Retrieve owner and timestamp information so that the memcpy in >> nfs4_get_referral fills in more attributes. >> >> Changes since v1: >> - Don't request attributes that the client unconditionally replaces >> - Request only MOUNTED_ON_FILEID or FILEID attribute, not both >> - encode_fs_locations() doesn't use the third bitmask word >> >> Fixes: 6b97fd3da1ea ("NFSv4: Follow a referral") >> Suggested-by: Pradeep Thomas <pradeepthomas@xxxxxxxxx> >> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> >> Cc: stable@xxxxxxxxxxxxxxx >> --- >> fs/nfs/nfs4proc.c | 18 ++++++++---------- >> 1 file changed, 8 insertions(+), 10 deletions(-) >> >> I could send this as an incremental, but that just seems to piss off >> distributors, who will just squash them all together anyway. >> >> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6c61e2b..2662879 >> 100644 >> --- a/fs/nfs/nfs4proc.c >> +++ b/fs/nfs/nfs4proc.c >> @@ -254,15 +254,12 @@ static int nfs4_map_errors(int err) }; >> >> const u32 nfs4_fs_locations_bitmap[3] = { >> - FATTR4_WORD0_TYPE >> - | FATTR4_WORD0_CHANGE >> + FATTR4_WORD0_CHANGE >> | FATTR4_WORD0_SIZE >> | FATTR4_WORD0_FSID >> | FATTR4_WORD0_FILEID >> | FATTR4_WORD0_FS_LOCATIONS, >> - FATTR4_WORD1_MODE >> - | FATTR4_WORD1_NUMLINKS >> - | FATTR4_WORD1_OWNER >> + FATTR4_WORD1_OWNER >> | FATTR4_WORD1_OWNER_GROUP >> | FATTR4_WORD1_RAWDEV >> | FATTR4_WORD1_SPACE_USED >> @@ -6763,9 +6760,7 @@ static int _nfs4_proc_fs_locations(struct rpc_clnt >> *client, struct inode *dir, >> struct page *page) >> { >> struct nfs_server *server = NFS_SERVER(dir); >> - u32 bitmask[3] = { >> - [0] = FATTR4_WORD0_FSID | >> FATTR4_WORD0_FS_LOCATIONS, >> - }; >> + u32 bitmask[3]; >> struct nfs4_fs_locations_arg args = { >> .dir_fh = NFS_FH(dir), >> .name = name, >> @@ -6784,12 +6779,15 @@ static int _nfs4_proc_fs_locations(struct rpc_clnt >> *client, struct inode *dir, >> >> dprintk("%s: start\n", __func__); >> >> + bitmask[0] = nfs4_fattr_bitmap[0] | >> FATTR4_WORD0_FS_LOCATIONS; >> + bitmask[1] = nfs4_fattr_bitmap[1]; >> + >> /* Ask for the fileid of the absent filesystem if mounted_on_fileid >> * is not supported */ >> if (NFS_SERVER(dir)->attr_bitmask[1] & >> FATTR4_WORD1_MOUNTED_ON_FILEID) >> - bitmask[1] |= FATTR4_WORD1_MOUNTED_ON_FILEID; >> + bitmask[0] &= ~FATTR4_WORD0_FILEID; >> else >> - bitmask[0] |= FATTR4_WORD0_FILEID; >> + bitmask[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID; >> >> nfs_fattr_init(&fs_locations->fattr); >> fs_locations->server = server; >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the >> body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at >> http://vger.kernel.org/majordomo-info.html > > > --- > This email has been checked for viruses by Avast antivirus software. > https://www.avast.com/antivirus > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
