diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-17 09:40:52 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-17 09:40:52 -0700 |
commit | e13cef8ded69e469b56e150e30619693b91b1864 (patch) | |
tree | 6848fd484b7d0e42c235ac54290f72dfde45d9ad /fs/nfs/dir.c | |
parent | b762799dd8b03ec0aafc54ba165564902eac3e18 (diff) | |
parent | e086ed76671252d5b539854a83f8506be7bea05c (diff) | |
download | blackbird-op-linux-e13cef8ded69e469b56e150e30619693b91b1864.tar.gz blackbird-op-linux-e13cef8ded69e469b56e150e30619693b91b1864.zip |
Merge tag 'iio-fixes-for-3.12c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus
Jonathan writes:
Third set of IIO fixes for the 3.12 cycle.
Two little ones this time:
1) A missing clk_unprepare in adf4350.
2) A missing free of the active_scan_mask when iio_disable_all_buffers is
called during an unexpected device removal. This leak was introduced by
the fix
a87c82e454f184a9473f8cdfd4d304205f585f65 iio: Stop sampling when the device is removed
and hence is a regression fix.
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 854a8f05a610..02b0df769e2d 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1458,7 +1458,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, trace_nfs_atomic_open_enter(dir, ctx, open_flags); nfs_block_sillyrename(dentry->d_parent); - inode = NFS_PROTO(dir)->open_context(dir, ctx, open_flags, &attr); + inode = NFS_PROTO(dir)->open_context(dir, ctx, open_flags, &attr, opened); nfs_unblock_sillyrename(dentry->d_parent); if (IS_ERR(inode)) { err = PTR_ERR(inode); |