diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 12:50:33 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 12:50:33 -0500 |
| commit | c2d8c259bfce056437e8dbc4b048944050f9b567 (patch) | |
| tree | 726e49653f7014bea034c59624ea23c21d6df13f /fs/nfs/unlink.c | |
| parent | e4de6c961cc8b688443c7989ae3e38d0518334a5 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge branch 'devel/debug_ll_init' into next/multiplatform
* devel/debug_ll_init:
ARM: implement debug_ll_io_init()
+ sync to Linux 3.7-rc4
Diffstat (limited to 'fs/nfs/unlink.c')
| -rw-r--r-- | fs/nfs/unlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 13cea637eff8..3f79c77153b8 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c | |||
| @@ -95,7 +95,7 @@ static void nfs_async_unlink_release(void *calldata) | |||
| 95 | 95 | ||
| 96 | nfs_dec_sillycount(data->dir); | 96 | nfs_dec_sillycount(data->dir); |
| 97 | nfs_free_unlinkdata(data); | 97 | nfs_free_unlinkdata(data); |
| 98 | nfs_sb_deactive(sb); | 98 | nfs_sb_deactive_async(sb); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static void nfs_unlink_prepare(struct rpc_task *task, void *calldata) | 101 | static void nfs_unlink_prepare(struct rpc_task *task, void *calldata) |