Patchwork cifs: clear server inode number flag while autodisabling

login
register
mail settings
Submitter Suresh Jayaraman
Date Nov. 16, 2009, 6:33 a.m.
Message ID <1258353196-6206-1-git-send-email-sjayaraman@suse.de>
Download mbox | patch
Permalink /patch/38485/
State New
Headers show

Comments

Suresh Jayaraman - Nov. 16, 2009, 6:33 a.m.
Fix the commit ec06aedd44 that intended to turn off querying for server inode
numbers when server doesn't consistently support inode numbers. Presumably
the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag, perhaps a
typo.

Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Cc: Jeff Layton <jlayton@redhat.com>
---
 fs/cifs/misc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Jeff Layton - Nov. 16, 2009, 12:39 p.m.
On Mon, 16 Nov 2009 12:03:16 +0530
Suresh Jayaraman <sjayaraman@suse.de> wrote:

> Fix the commit ec06aedd44 that intended to turn off querying for server inode
> numbers when server doesn't consistently support inode numbers. Presumably
> the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag, perhaps a
> typo.
> 
> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
> Cc: Jeff Layton <jlayton@redhat.com>
> ---
>  fs/cifs/misc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
> index 1e25efc..d27d4ec 100644
> --- a/fs/cifs/misc.c
> +++ b/fs/cifs/misc.c
> @@ -720,7 +720,7 @@ void
>  cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
>  {
>  	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
> -		cifs_sb->mnt_cifs_flags &= CIFS_MOUNT_SERVER_INUM;
> +		cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
>  		cERROR(1, ("Autodisabling the use of server inode numbers on "
>  			   "%s. This server doesn't seem to support them "
>  			   "properly. Hardlinks will not be recognized on this "

Doh! Boneheaded error...

Acked-by: Jeff Layton <jlayton@redhat.com>
Jeff Layton - Nov. 16, 2009, 1:40 p.m.
On Mon, 16 Nov 2009 07:39:43 -0500
Jeff Layton <jlayton@redhat.com> wrote:

> On Mon, 16 Nov 2009 12:03:16 +0530
> Suresh Jayaraman <sjayaraman@suse.de> wrote:
> 
> > Fix the commit ec06aedd44 that intended to turn off querying for server inode
> > numbers when server doesn't consistently support inode numbers. Presumably
> > the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag, perhaps a
> > typo.
> > 
> > Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
> > Cc: Jeff Layton <jlayton@redhat.com>
> > ---
> >  fs/cifs/misc.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
> > index 1e25efc..d27d4ec 100644
> > --- a/fs/cifs/misc.c
> > +++ b/fs/cifs/misc.c
> > @@ -720,7 +720,7 @@ void
> >  cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
> >  {
> >  	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
> > -		cifs_sb->mnt_cifs_flags &= CIFS_MOUNT_SERVER_INUM;
> > +		cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
> >  		cERROR(1, ("Autodisabling the use of server inode numbers on "
> >  			   "%s. This server doesn't seem to support them "
> >  			   "properly. Hardlinks will not be recognized on this "
> 
> Doh! Boneheaded error...
> 
> Acked-by: Jeff Layton <jlayton@redhat.com>


This patch probably needs to go to 2.6.32 and -stable.
Suresh Jayaraman - Nov. 16, 2009, 1:42 p.m.
On 11/16/2009 07:10 PM, Jeff Layton wrote:
> On Mon, 16 Nov 2009 07:39:43 -0500
> Jeff Layton <jlayton@redhat.com> wrote:
> 
>> On Mon, 16 Nov 2009 12:03:16 +0530
>> Suresh Jayaraman <sjayaraman@suse.de> wrote:
>>
>>> Fix the commit ec06aedd44 that intended to turn off querying for server inode
>>> numbers when server doesn't consistently support inode numbers. Presumably
>>> the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag, perhaps a
>>> typo.
>>>
>>> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
>>> Cc: Jeff Layton <jlayton@redhat.com>
>>> ---
>>>  fs/cifs/misc.c |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
>>> index 1e25efc..d27d4ec 100644
>>> --- a/fs/cifs/misc.c
>>> +++ b/fs/cifs/misc.c
>>> @@ -720,7 +720,7 @@ void
>>>  cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
>>>  {
>>>  	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
>>> -		cifs_sb->mnt_cifs_flags &= CIFS_MOUNT_SERVER_INUM;
>>> +		cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
>>>  		cERROR(1, ("Autodisabling the use of server inode numbers on "
>>>  			   "%s. This server doesn't seem to support them "
>>>  			   "properly. Hardlinks will not be recognized on this "
>>
>> Doh! Boneheaded error...
>>
>> Acked-by: Jeff Layton <jlayton@redhat.com>
> 
> 
> This patch probably needs to go to 2.6.32 and -stable.
> 

Ah, yes, please include -Cc stable.

Cc: Stable <stable@kernel.org>


Thanks,
Steve French - Nov. 16, 2009, 3:25 p.m.
Merged into cifs-2.6.git

Will request upstream later today.

On Mon, Nov 16, 2009 at 7:42 AM, Suresh Jayaraman <sjayaraman@suse.de>wrote:

> On 11/16/2009 07:10 PM, Jeff Layton wrote:
> > On Mon, 16 Nov 2009 07:39:43 -0500
> > Jeff Layton <jlayton@redhat.com> wrote:
> >
> >> On Mon, 16 Nov 2009 12:03:16 +0530
> >> Suresh Jayaraman <sjayaraman@suse.de> wrote:
> >>
> >>> Fix the commit ec06aedd44 that intended to turn off querying for server
> inode
> >>> numbers when server doesn't consistently support inode numbers.
> Presumably
> >>> the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag,
> perhaps a
> >>> typo.
> >>>
> >>> Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
> >>> Cc: Jeff Layton <jlayton@redhat.com>
> >>> ---
> >>>  fs/cifs/misc.c |    2 +-
> >>>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>>
> >>> diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
> >>> index 1e25efc..d27d4ec 100644
> >>> --- a/fs/cifs/misc.c
> >>> +++ b/fs/cifs/misc.c
> >>> @@ -720,7 +720,7 @@ void
> >>>  cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
> >>>  {
> >>>     if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
> >>> -           cifs_sb->mnt_cifs_flags &= CIFS_MOUNT_SERVER_INUM;
> >>> +           cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
> >>>             cERROR(1, ("Autodisabling the use of server inode numbers
> on "
> >>>                        "%s. This server doesn't seem to support them "
> >>>                        "properly. Hardlinks will not be recognized on
> this "
> >>
> >> Doh! Boneheaded error...
> >>
> >> Acked-by: Jeff Layton <jlayton@redhat.com>
> >
> >
> > This patch probably needs to go to 2.6.32 and -stable.
> >
>
> Ah, yes, please include -Cc stable.
>
> Cc: Stable <stable@kernel.org>
>
>
> Thanks,
>
> --
> Suresh Jayaraman
>

Patch

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 1e25efc..d27d4ec 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -720,7 +720,7 @@  void
 cifs_autodisable_serverino(struct cifs_sb_info *cifs_sb)
 {
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
-		cifs_sb->mnt_cifs_flags &= CIFS_MOUNT_SERVER_INUM;
+		cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
 		cERROR(1, ("Autodisabling the use of server inode numbers on "
 			   "%s. This server doesn't seem to support them "
 			   "properly. Hardlinks will not be recognized on this "