Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: ocfs2_write_begin_nolock() should handle len=0
ocfs2: invalidate dentry if its dentry_lock isn't initialized.
+13
-2
+2
-2
fs/ocfs2/aops.c
+2
-2
fs/ocfs2/aops.c
···
1747
1747
* we know zeros will only be needed in the first and/or last cluster.
1748
1748
*/
1749
1749
if (clusters_to_alloc || extents_to_split ||
1750
-
wc->w_desc[0].c_needs_zero ||
1751
-
wc->w_desc[wc->w_clen - 1].c_needs_zero)
1750
+
(wc->w_clen && (wc->w_desc[0].c_needs_zero ||
1751
+
wc->w_desc[wc->w_clen - 1].c_needs_zero)))
1752
1752
cluster_of_pages = 1;
1753
1753
else
1754
1754
cluster_of_pages = 0;
+11
fs/ocfs2/dcache.c
+11
fs/ocfs2/dcache.c
···
85
85
goto bail;
86
86
}
87
87
88
+
/*
89
+
* If the last lookup failed to create dentry lock, let us
90
+
* redo it.
91
+
*/
92
+
if (!dentry->d_fsdata) {
93
+
mlog(0, "Inode %llu doesn't have dentry lock, "
94
+
"returning false\n",
95
+
(unsigned long long)OCFS2_I(inode)->ip_blkno);
96
+
goto bail;
97
+
}
98
+
88
99
ret = 1;
89
100
90
101
bail: