[PATCH] knfsd: remove redundant initialization in nfsd4_lockt

No need to set fl_owner and fl_pid to 0, since that's already been done by
locks_init_lock.

Signed-off-by: Andy Adamson <andros@umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 660945bd7daa7f9569f38e29d399eadd21be933e..1ca8ce8f6680bb5b0741657473190d680ee2c574 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2268,7 +2268,6 @@ int
 nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lockt *lockt)
 {
        struct inode *inode;
-       struct nfs4_stateowner *sop;
        struct file file;
        struct file_lock file_lock;
        struct file_lock *conflicting_lock;
@@ -2320,14 +2319,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
        find_lockstateowner_str(strhashval, &lockt->lt_owner,
                                        &lockt->lt_clientid, 
                                        &lockt->lt_stateowner);
-       sop = lockt->lt_stateowner;
-       if (sop) {
-               file_lock.fl_owner = (fl_owner_t) sop;
-               file_lock.fl_pid = current->tgid;
-       } else {
-               file_lock.fl_owner = NULL;
-               file_lock.fl_pid = 0;
-       }
+       if (lockt->lt_stateowner)
+               file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner;
+       file_lock.fl_pid = current->tgid;
        file_lock.fl_flags = FL_POSIX;
 
        file_lock.fl_start = lockt->lt_offset;