From 37c82e3709b6dc5851295e2ef5e3b22f7f4cdb34 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Mon, 20 May 2013 20:28:47 +0900 Subject: [PATCH] --- yaml --- r: 377673 b: refs/heads/master c: 77888c1e42e8c76e16204cd99c19a01829421402 h: refs/heads/master i: 377671: bdf309969e2bb72a5e57bd638de8b8fcf0b63932 v: v3 --- [refs] | 2 +- trunk/fs/f2fs/f2fs.h | 5 +++++ trunk/fs/f2fs/file.c | 2 +- trunk/fs/f2fs/super.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f3569d3731ce..28b24f94125a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f85b3520325a67ee4ac33e75bbcdbc25c79ce69 +refs/heads/master: 77888c1e42e8c76e16204cd99c19a01829421402 diff --git a/trunk/fs/f2fs/f2fs.h b/trunk/fs/f2fs/f2fs.h index 9182b2710db7..6594ce15a7bb 100644 --- a/trunk/fs/f2fs/f2fs.h +++ b/trunk/fs/f2fs/f2fs.h @@ -887,6 +887,11 @@ static inline int cond_clear_inode_flag(struct f2fs_inode_info *fi, int flag) return 0; } +static inline int f2fs_readonly(struct super_block *sb) +{ + return sb->s_flags & MS_RDONLY; +} + /* * file.c */ diff --git a/trunk/fs/f2fs/file.c b/trunk/fs/f2fs/file.c index 9937ba1a4d24..316bcfe80448 100644 --- a/trunk/fs/f2fs/file.c +++ b/trunk/fs/f2fs/file.c @@ -114,7 +114,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) .for_reclaim = 0, }; - if (inode->i_sb->s_flags & MS_RDONLY) + if (f2fs_readonly(inode->i_sb)) return 0; trace_f2fs_sync_file_enter(inode); diff --git a/trunk/fs/f2fs/super.c b/trunk/fs/f2fs/super.c index 8555f7df82c7..3ac305da7cee 100644 --- a/trunk/fs/f2fs/super.c +++ b/trunk/fs/f2fs/super.c @@ -170,7 +170,7 @@ static int f2fs_freeze(struct super_block *sb) { int err; - if (sb->s_flags & MS_RDONLY) + if (f2fs_readonly(sb)) return 0; err = f2fs_sync_fs(sb, 1);