| Message ID | 20181002100848.GA31166@embeddedor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nfsd: fix fall-through annotations | expand |
Thanks, applying.--b. On Tue, Oct 02, 2018 at 12:08:48PM +0200, Gustavo A. R. Silva wrote: > Replace "fallthru" with a proper "fall through" annotation. > > Also, add an annotation were it is expected to fall through. > > These fixes are part of the ongoing efforts to enabling > -Wimplicit-fallthrough > > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > --- > fs/nfsd/vfs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c > index d74583f..2751976 100644 > --- a/fs/nfsd/vfs.c > +++ b/fs/nfsd/vfs.c > @@ -1407,6 +1407,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, > *created = 1; > break; > } > + /* fall through */ > case NFS4_CREATE_EXCLUSIVE4_1: > if ( d_inode(dchild)->i_mtime.tv_sec == v_mtime > && d_inode(dchild)->i_atime.tv_sec == v_atime > @@ -1415,7 +1416,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, > *created = 1; > goto set_attr; > } > - /* fallthru */ > + /* fall through */ > case NFS3_CREATE_GUARDED: > err = nfserr_exist; > } > -- > 2.7.4
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index d74583f..2751976 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1407,6 +1407,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, *created = 1; break; } + /* fall through */ case NFS4_CREATE_EXCLUSIVE4_1: if ( d_inode(dchild)->i_mtime.tv_sec == v_mtime && d_inode(dchild)->i_atime.tv_sec == v_atime @@ -1415,7 +1416,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, *created = 1; goto set_attr; } - /* fallthru */ + /* fall through */ case NFS3_CREATE_GUARDED: err = nfserr_exist; }
Replace "fallthru" with a proper "fall through" annotation. Also, add an annotation were it is expected to fall through. These fixes are part of the ongoing efforts to enabling -Wimplicit-fallthrough Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- fs/nfsd/vfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)