[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-24
Subject:    [XFS] Fix merge botch affecting xfs_setattr for realtime files.
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2004-09-30 1:48:23
Message-ID: 200412120002.iBC02m0S005348 () hera ! kernel ! org
[Download RAW message or body]

ChangeSet 1.1449.43.12, 2004/09/30 11:48:23+10:00, nathans@sgi.com

	[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>



 xfs_vnodeops.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


diff -Nru a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
--- a/fs/xfs/xfs_vnodeops.c	2004-12-11 16:02:51 -08:00
+++ b/fs/xfs/xfs_vnodeops.c	2004-12-11 16:02:51 -08:00
@@ -841,17 +841,17 @@
 			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;
 		}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]