[XFS] Fix merge botch affecting xfs_setattr for realtime files.

SGI Modid: xfs-linux:xfs-kern:19619a
Signed-off-by: Nathan Scott <nathans@sgi.com>

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 4f568b5a4b5d9d313302d674f5854812741d4958..da847a19d4a537cdf7fde98fbdcc15fcd4ca9a33 100644 (file)
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -841,17 +841,17 @@ xfs_setattr(
                        if (vap->va_xflags & XFS_XFLAG_NODUMP)
                                di_flags |= XFS_DIFLAG_NODUMP;
                        if ((ip->i_d.di_mode & S_IFMT) == S_IFDIR) {
-                               if (vap->va_xflags & XFS_XFLAG_REALTIME) {
-                                       ip->i_iocore.io_flags |= XFS_IOCORE_RT;
-                                       di_flags |= XFS_DIFLAG_REALTIME;
-                               }
                                if (vap->va_xflags & XFS_XFLAG_RTINHERIT)
                                        di_flags |= XFS_DIFLAG_RTINHERIT;
                                if (vap->va_xflags & XFS_XFLAG_NOSYMLINKS)
                                        di_flags |= XFS_DIFLAG_NOSYMLINKS;
                        } else {
-                               if (!(vap->va_xflags & XFS_XFLAG_REALTIME))
+                               if (vap->va_xflags & XFS_XFLAG_REALTIME) {
+                                       di_flags |= XFS_DIFLAG_REALTIME;
+                                       ip->i_iocore.io_flags |= XFS_IOCORE_RT;
+                               } else {
                                        ip->i_iocore.io_flags &= ~XFS_IOCORE_RT;
+                               }
                        }
                        ip->i_d.di_flags = di_flags;
                }