summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4filelayout.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 19:15:57 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 19:15:57 +0200
commita7c1a644e16400a33e122f2b03c6a34240001b49 (patch)
tree21c2dbede682ed656d1660d7fee657d3aea2c4f1 /fs/nfs/nfs4filelayout.c
parentASoC: samsung: remove last traces of neo1973-gta01 (diff)
parentASoC: Samsung: set drvdata before adding secondary device (diff)
downloadlinux-a7c1a644e16400a33e122f2b03c6a34240001b49.tar.xz
linux-a7c1a644e16400a33e122f2b03c6a34240001b49.zip
Merge branch 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r--fs/nfs/nfs4filelayout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 49eeb044c109..4fb234d3aefb 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -129,7 +129,6 @@ static void filelayout_fenceme(struct inode *inode, struct pnfs_layout_hdr *lo)
{
if (!test_and_clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))
return;
- clear_bit(NFS_INO_LAYOUTCOMMIT, &NFS_I(inode)->flags);
pnfs_return_layout(inode);
}