Patchwork cifs: disable serverino if server doesn't support it

login
register
mail settings
Submitter Jeff Layton
Date July 22, 2009, 7:08 p.m.
Message ID <1248289738-13867-1-git-send-email-jlayton@redhat.com>
Download mbox | patch
Permalink /patch/53730/
State New
Headers show

Comments

Jeff Layton - July 22, 2009, 7:08 p.m.
A recent regression when dealing with older servers. This bug was
introduced when we made serverino the default...

When the server can't provide inode numbers, disable it for the mount.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/cifs/inode.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Suresh Jayaraman - July 23, 2009, 4:06 a.m.
Steve French wrote:
> Makes sense - not a new problem, but important to get in before 2.6.31
> (as you say with the new default)
> 
> On Wed, Jul 22, 2009 at 2:08 PM, Jeff Layton<jlayton@redhat.com> wrote:
>> A recent regression when dealing with older servers. This bug was
>> introduced when we made serverino the default...
>>
>> When the server can't provide inode numbers, disable it for the mount.

Sorry for chiming in late..

>> Signed-off-by: Jeff Layton <jlayton@redhat.com>
>> ---
>> �fs/cifs/inode.c | � �5 ++++-
>> �1 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
>> index 2680a5b..b93bf00 100644
>> --- a/fs/cifs/inode.c
>> +++ b/fs/cifs/inode.c
>> @@ -513,9 +513,12 @@ int cifs_get_inode_info(struct inode **pinode,
>> � � � � � � � � � � � � � � � � � � � �cifs_sb->mnt_cifs_flags &
>> � � � � � � � � � � � � � � � � � � � � � � � �CIFS_MOUNT_MAP_SPECIAL_CHR);
>> � � � � � � � � � � � �if (rc1) {
>> - � � � � � � � � � � � � � � � /* BB EOPNOSUPP disable SERVER_INUM? */
>> � � � � � � � � � � � � � � � �cFYI(1, ("GetSrvInodeNum rc %d", rc1));
>> � � � � � � � � � � � � � � � �fattr.cf_uniqueid = iunique(sb, ROOT_I);
>> + � � � � � � � � � � � � � � � /* disable serverino if call not supported */
>> + � � � � � � � � � � � � � � � if (rc1 == -EINVAL)

What is the expected error code if server is not supporting/providing
inode numbers - -EINVAL or -EOPNOTSUPP?
Because, we seem to use -EOPNOTSUPP in is_path_accessible(), perhaps we
need to fix there too?


>> + � � � � � � � � � � � � � � � � � � � cifs_sb->mnt_cifs_flags &=
>> + � � � � � � � � � � � � � � � � � � � � � � � � � � � ~CIFS_MOUNT_SERVER_INUM;
>> � � � � � � � � � � � �}
>> � � � � � � � �} else {
>> � � � � � � � � � � � �fattr.cf_uniqueid = iunique(sb, ROOT_I);
>> --

Thanks,

Patch

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 2680a5b..b93bf00 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -513,9 +513,12 @@  int cifs_get_inode_info(struct inode **pinode,
 					cifs_sb->mnt_cifs_flags &
 						CIFS_MOUNT_MAP_SPECIAL_CHR);
 			if (rc1) {
-				/* BB EOPNOSUPP disable SERVER_INUM? */
 				cFYI(1, ("GetSrvInodeNum rc %d", rc1));
 				fattr.cf_uniqueid = iunique(sb, ROOT_I);
+				/* disable serverino if call not supported */
+				if (rc1 == -EINVAL)
+					cifs_sb->mnt_cifs_flags &=
+							~CIFS_MOUNT_SERVER_INUM;
 			}
 		} else {
 			fattr.cf_uniqueid = iunique(sb, ROOT_I);