Date: Mon, 7 Jul 2008 13:53:11 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 144827 for review Message-ID: <200807071353.m67DrBU5043171@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=144827 Change 144827 by trasz@trasz_traszkan on 2008/07/07 13:52:43 Fix a mismerge. This makes the p4 version of the kernel actually compilable. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#5 (text+ko) ==== @@ -170,6 +170,7 @@ */ vfs_deleteopt(mp->mnt_optnew, "snapshot"); vfs_deleteopt(mp->mnt_opt, "snapshot"); + } if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) { if (mntorflags & MNT_ACLS) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807071353.m67DrBU5043171>