From: Alex Shi <alex.shi@linaro.org>
Date: Mon, 16 Mar 2015 07:52:47 +0000 (+0800)
Subject: Merge branch 'linaro-android-3.10-lsk' of
X-Git-Tag: firefly_0821_release~3680^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=910c2c512670cde02f5fb7570f622e636257874e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linaro-android-3.10-lsk' of
git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
---

910c2c512670cde02f5fb7570f622e636257874e
diff --cc fs/udf/super.c
index 839a2bad7f45,3b1a4bea332d..32f5297dfbab
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@@ -629,13 -629,8 +629,14 @@@ static int udf_remount_fs(struct super_
  	struct udf_options uopt;
  	struct udf_sb_info *sbi = UDF_SB(sb);
  	int error = 0;
+ 	sync_filesystem(sb);
  
 +	if (sbi->s_lvid_bh) {
 +		int write_rev = le16_to_cpu(udf_sb_lvidiu(sbi)->minUDFWriteRev);
 +		if (write_rev > UDF_MAX_WRITE_VERSION && !(*flags & MS_RDONLY))
 +			return -EACCES;
 +	}
 +
  	uopt.flags = sbi->s_flags;
  	uopt.uid   = sbi->s_uid;
  	uopt.gid   = sbi->s_gid;