Before writing to overlay file, need to check if either overlay or upper fs are frozen. This allows freezing overlayfs mount independently of freezing underlying fs. Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> --- include/linux/fs.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 4a7f3cc..71811be 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2547,14 +2547,26 @@ static inline void file_start_write(struct file *file) { if (!S_ISREG(file_inode(file)->i_mode)) return; + __sb_start_write(locks_inode(file)->i_sb, SB_FREEZE_WRITE, true); + if (likely(locks_inode(file) == file_inode(file))) + return; __sb_start_write(file_inode(file)->i_sb, SB_FREEZE_WRITE, true); + } static inline bool file_start_write_trylock(struct file *file) { + int ret; + if (!S_ISREG(file_inode(file)->i_mode)) return true; - return __sb_start_write(file_inode(file)->i_sb, SB_FREEZE_WRITE, false); + ret = __sb_start_write(locks_inode(file)->i_sb, SB_FREEZE_WRITE, false); + if (!ret || likely(locks_inode(file) == file_inode(file))) + return ret; + ret = __sb_start_write(file_inode(file)->i_sb, SB_FREEZE_WRITE, false); + if (!ret) + __sb_end_write(locks_inode(file)->i_sb, SB_FREEZE_WRITE); + return ret; } static inline void file_end_write(struct file *file) @@ -2562,6 +2574,9 @@ static inline void file_end_write(struct file *file) if (!S_ISREG(file_inode(file)->i_mode)) return; __sb_end_write(file_inode(file)->i_sb, SB_FREEZE_WRITE); + if (likely(locks_inode(file) == file_inode(file))) + return; + __sb_end_write(locks_inode(file)->i_sb, SB_FREEZE_WRITE); } /* -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html