From f30162679f97bee93df21ca88af53310c3c4ccb5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 9 Feb 2004 00:30:48 -0800 Subject: [PATCH] [PATCH] NFS: fix for older gcc's From: Trond Myklebust Fix for proper C99 designated initializer, and avoid warning from missing (unreachable - but gcc doesn't know it) return. --- fs/nfs/nfs4proc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 3d509bd94b0e6..2471044408256 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2061,6 +2061,7 @@ nfs4_lck_type(int cmd, struct file_lock *request) return NFS4_WRITE_LT; } BUG(); + return 0; } static inline uint64_t @@ -2208,7 +2209,9 @@ nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) if (lsp == NULL) { struct nfs4_state_owner *owner = state->owner; struct nfs_open_to_lock otl = { - .lock_owner.clientid = server->nfs4_state->cl_clientid, + .lock_owner = { + .clientid = server->nfs4_state->cl_clientid, + }, }; status = -ENOMEM; lsp = nfs4_alloc_lock_state(state, request->fl_owner); -- 2.53.0