On 01/14/2011 01:59 AM, Sukadev Bhattiprolu wrote: > Oren Laadan [orenl@xxxxxxxxxxxxxxx] wrote: > | Folks, > | > | I just pushed out a new v23-rc1 branch of linux-cr. This one is > | rebased to 2.6.37, and contains nearly all the patches pulled > | on v22-dev. I only gave it a brief test drive... feel free to > | throw all your ammo it. > > Oren, > > We need the file_tty() helper to get the tty object from the file pointer > (otherwise we will be off by 4 bytes and fail tty_paranoia_check() in > tty_file_checkpoint()). Ok, applied. Thanks, Oren. > > Thanks, > > Sukadev > > diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c > index c89f055..6aa458e 100644 > --- a/drivers/tty/tty_io.c > +++ b/drivers/tty/tty_io.c > @@ -2781,7 +2784,7 @@ static int tty_file_checkpoint(struct ckpt_ctx *ctx, struc > int master_objref, slave_objref; > int ret; > > - tty = (struct tty_struct *)file->private_data; > + tty = file_tty(file); > inode = file->f_path.dentry->d_inode; > if (tty_paranoia_check(tty, inode, "tty_file_checkpoint")) > return -EIO; > _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers
