#ifndef CONNTRACK_H #define CONNTRACK_H #include #include #include #include #endif /* CONNTRACK_H */ gi/linux/net-next.git/atom/?h=nds-private-remove' type='application/atom+xml'/>
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-10 14:23:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-10 14:23:45 -0800
commit7fe654dca20892f37226c31bdd2d5b932f8d843a (patch)
tree0a7d3c1e4eff0a0194fc265efae10ad1cbd2e0c5
parent3ebc7033168d43d12e4941f48a6f257d3f1ea1b5 (diff)
parent0839ffb83e44e5ff1843e932592525fc2bff23ff (diff)
Merge tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux
Pull nfsd revert from Bruce Fields: "This patch turned out to have a couple problems. The problems are fixable, but at least one of the fixes is a little ugly. The original bug has always been there, so we can wait another week or two to get this right" * tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux: nfsd: Revert "nfsd: special case truncates some more"
Diffstat
-rw-r--r--fs/nfsd/vfs.c97
1 files changed, 60 insertions, 37 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c