summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_bmap.c
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2005-11-02 15:00:20 +1100
committerNathan Scott <nathans@sgi.com>2005-11-02 15:00:20 +1100
commitda087bad810b48dd889a504e6af0a582ba18df0d (patch)
tree2b94f17722bc632dde1ca2ab9805e0f51b57054e /fs/xfs/xfs_bmap.c
parent0116d9356bfa8607a6e2efb5263100a6c72eabb0 (diff)
downloadblackbird-op-linux-da087bad810b48dd889a504e6af0a582ba18df0d.tar.gz
blackbird-op-linux-da087bad810b48dd889a504e6af0a582ba18df0d.zip
[XFS] Fix up a 32/64 local flags variable issue when enabling attr2 mode.
SGI-PV: 941645 SGI-Modid: xfs-linux:xfs-kern:23925a Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
-rw-r--r--fs/xfs/xfs_bmap.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index 82496d901d23..fbd48f9b797e 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -3909,19 +3909,20 @@ xfs_bmap_add_attrfork(
goto error2;
if (!XFS_SB_VERSION_HASATTR(&mp->m_sb) ||
(!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2)) {
- logflags = 0;
+ __int64_t sbfields = 0;
+
s = XFS_SB_LOCK(mp);
if (!XFS_SB_VERSION_HASATTR(&mp->m_sb)) {
XFS_SB_VERSION_ADDATTR(&mp->m_sb);
- logflags |= XFS_SB_VERSIONNUM;
+ sbfields |= XFS_SB_VERSIONNUM;
}
if (!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2) {
XFS_SB_VERSION_ADDATTR2(&mp->m_sb);
- logflags |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);
+ sbfields |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);
}
- if (logflags) {
+ if (sbfields) {
XFS_SB_UNLOCK(mp, s);
- xfs_mod_sb(tp, logflags);
+ xfs_mod_sb(tp, sbfields);
} else
XFS_SB_UNLOCK(mp, s);
}
OpenPOWER on IntegriCloud