diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-01-28 21:56:45 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-01-28 21:56:45 -0500 |
| commit | e4e3c3f17fdb78282e3d9b4af7ec90d6e65798eb (patch) | |
| tree | b7018503c1b343e46b9a406855e64ec13bd62d6a /fs/nfsd/nfs4state.c | |
| parent | ae5e6d05a606e05e054f816bd01e02f69d38d283 (diff) | |
| parent | c20f326a62c046ee958c3aa584f183201adb229f (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 88db7d3ec120..b6f60f48e94b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -2871,7 +2871,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
| 2871 | file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner; | 2871 | file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner; |
| 2872 | file_lock.fl_pid = current->tgid; | 2872 | file_lock.fl_pid = current->tgid; |
| 2873 | file_lock.fl_flags = FL_POSIX; | 2873 | file_lock.fl_flags = FL_POSIX; |
| 2874 | file_lock.fl_lmops = &nfsd_posix_mng_ops; | ||
| 2875 | 2874 | ||
| 2876 | file_lock.fl_start = lockt->lt_offset; | 2875 | file_lock.fl_start = lockt->lt_offset; |
| 2877 | file_lock.fl_end = last_byte_offset(lockt->lt_offset, lockt->lt_length); | 2876 | file_lock.fl_end = last_byte_offset(lockt->lt_offset, lockt->lt_length); |