Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8daed1e549b55827758b3af7b8132a73fc51526f

Authored by J. Bruce Fields
1 parent 89996df4b5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

nfsd: silence lockdep warning 

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

fs/nfsd/nfs4recover.c
Diff comments   View file @ 8daed1e
... ... @@ -229,7 +229,7 @@
229 229 goto out;
230 230 status = vfs_readdir(filp, nfsd4_build_namelist, &names);
231 231 fput(filp);
232   - mutex_lock(&dir->d_inode->i_mutex);
  232 + mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
233 233 while (!list_empty(&names)) {
234 234 entry = list_entry(names.next, struct name_list, list);
235 235  
... ... @@ -264,7 +264,7 @@
264 264  
265 265 dprintk("NFSD: nfsd4_unlink_clid_dir. name %.*s\n", namlen, name);
266 266  
267   - mutex_lock(&rec_dir.dentry->d_inode->i_mutex);
  267 + mutex_lock_nested(&rec_dir.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
268 268 dentry = lookup_one_len(name, rec_dir.dentry, namlen);
269 269 if (IS_ERR(dentry)) {
270 270 status = PTR_ERR(dentry);