union_subr.c (cd72f2180bfff020d03180e6eba1c3a0e0125468) | union_subr.c (48e3128b34dad9618402f1f4095f7655e779843c) |
---|---|
1/* 2 * Copyright (c) 1994 Jan-Simon Pendry 3 * Copyright (c) 1994 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * Jan-Simon Pendry. 8 * --- 1315 unchanged lines hidden (view full) --- 1324 if (error == 0 && vn_canvmio(lvp) == TRUE) 1325 error = vfs_object_create(lvp, td, fp->f_cred); 1326 if (error) { 1327 vput(lvp); 1328 return (error); 1329 } 1330 VOP_UNLOCK(lvp, 0, td); 1331 FILE_LOCK(fp); | 1/* 2 * Copyright (c) 1994 Jan-Simon Pendry 3 * Copyright (c) 1994 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * Jan-Simon Pendry. 8 * --- 1315 unchanged lines hidden (view full) --- 1324 if (error == 0 && vn_canvmio(lvp) == TRUE) 1325 error = vfs_object_create(lvp, td, fp->f_cred); 1326 if (error) { 1327 vput(lvp); 1328 return (error); 1329 } 1330 VOP_UNLOCK(lvp, 0, td); 1331 FILE_LOCK(fp); |
1332 fp->un_data.vnode = lvp; | 1332 fp->f_data = lvp; |
1333 fp->f_offset = 0; 1334 FILE_UNLOCK(fp); 1335 error = vn_close(*vp, FREAD, fp->f_cred, td); 1336 if (error) 1337 return (error); 1338 *vp = lvp; 1339 return -1; /* goto unionread */ 1340 } --- 27 unchanged lines hidden --- | 1333 fp->f_offset = 0; 1334 FILE_UNLOCK(fp); 1335 error = vn_close(*vp, FREAD, fp->f_cred, td); 1336 if (error) 1337 return (error); 1338 *vp = lvp; 1339 return -1; /* goto unionread */ 1340 } --- 27 unchanged lines hidden --- |