Re: [PATCH] nfsd: properly convert return from commit_metadata to __be32

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jul 3, 2014 at 7:54 AM, Jeff Layton <jlayton@xxxxxxxxxxxxxxx> wrote:
> Commit 2a7420c03e504 (nfsd: Ensure that nfsd_create_setattr commits
> files to stable storage), added a couple of calls to commit_metadata,
> but doesn't convert their return codes to __be32 in the appropriate
> places.
>
> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
> ---
>  fs/nfsd/vfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index e1b792ada45b..f501a9b5c9df 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -463,7 +463,7 @@ out_put_write_access:
>         if (size_change)
>                 put_write_access(inode);
>         if (!err)
> -               err = commit_metadata(fhp);
> +               err = nfserrno(commit_metadata(fhp));
>  out:
>         return err;
>  }
> @@ -1122,7 +1122,7 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *resfhp,
>         if (iap->ia_valid)
>                 return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
>         /* Callers expect file metadata to be committed here */
> -       return commit_metadata(resfhp);
> +       return nfserrno(commit_metadata(resfhp));
>  }
>
>  /* HPUX client sometimes creates a file in mode 000, and sets size to 0.
> --
> 1.9.3
>

Doh! Thanks Jeff!...

-- 
Trond Myklebust

Linux NFS client maintainer, PrimaryData

trond.myklebust@xxxxxxxxxxxxxxx
--
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




[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux