From 2450dad6bcb070cc63328ef9df2fafb1f5f42bce Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Thu, 28 Mar 2013 20:37:14 -0400 Subject: [PATCH] --- yaml --- r: 372193 b: refs/heads/master c: 0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5 h: refs/heads/master i: 372191: 59ac23ae4ec682927582b733b17ef8b3b4ab414f v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 41cfdca74b35..c363b29044bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb2099f31b0f090684a64ef8df44a30ff7c45fc2 +refs/heads/master: 0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index ff1577d6df62..7d2e3b54b9df 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -307,13 +307,7 @@ static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) { if (atomic_dec_and_test(&fp->fi_access[oflag])) { nfs4_file_put_fd(fp, oflag); - /* - * It's also safe to get rid of the RDWR open *if* - * we no longer have need of the other kind of access - * or if we already have the other kind of open: - */ - if (fp->fi_fds[1-oflag] - || atomic_read(&fp->fi_access[1 - oflag]) == 0) + if (atomic_read(&fp->fi_access[1 - oflag]) == 0) nfs4_file_put_fd(fp, O_RDWR); } }