diff options
| author | Olof Johansson | 2013-06-12 16:50:10 -0700 |
|---|---|---|
| committer | Olof Johansson | 2013-06-12 16:50:10 -0700 |
| commit | ff299f1b1cb4e0c44a3f76d1f8ee4eb2f64f098f (patch) | |
| tree | 9e4d85cfc0c5a8394bc1fcafd7c406c5ac558c70 /fs/gfs2/lops.c | |
| parent | 7d428ce284fce4aacb215ca15d0274e7261864a3 (diff) | |
| parent | ae7b6dccf6711e8d5815688f1572ab55bf5b3069 (diff) | |
Merge tag 's3c24xx-driver-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
From Kukjin Kim, driver updats for s3c24xx:
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/gfs2/lops.c')
| -rw-r--r-- | fs/gfs2/lops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 68b4c8f1fce8..6c33d7b6e0c4 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c @@ -419,7 +419,9 @@ static void gfs2_before_commit(struct gfs2_sbd *sdp, unsigned int limit, if (total > limit) num = limit; gfs2_log_unlock(sdp); - page = gfs2_get_log_desc(sdp, GFS2_LOG_DESC_METADATA, num + 1, num); + page = gfs2_get_log_desc(sdp, + is_databuf ? GFS2_LOG_DESC_JDATA : + GFS2_LOG_DESC_METADATA, num + 1, num); ld = page_address(page); gfs2_log_lock(sdp); ptr = (__be64 *)(ld + 1); |