Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: Thomas de Beauchene Newsgroups: linux.kernel Subject: [PATCH] Documentation: filesystems: updated struct file_operations documentation in vfs.txt Date: Sat, 06 Jun 2015 15:20:01 +0200 Message-ID: X-Original-To: X-Greylist: delayed 1127 seconds by postgrey-1.27 at vger.kernel.org; Sat, 06 Jun 2015 09:17:28 EDT Authentication-Results: lwn.net; dkim=none (message not signed) header.d=none; X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [163.5.218.56] X-Clientproxiedby: DB3PR03CA0048.eurprd03.prod.outlook.com (10.255.183.48) To AM2PR02MB0372.eurprd02.prod.outlook.com (25.160.33.151) X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR02MB0372;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR02MB257; X-Microsoft-Antispam-Prvs: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-Cfa-Test: BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:AM2PR02MB0372;BCL:0;PCL:0;RULEID:;SRVR:AM2PR02MB0372; X-Forefront-Prvs: 05991796DF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(107886002)(62966003)(77156002)(19580405001)(110136002)(74482002)(50226001)(189998001)(36756003)(42186005)(5001960100002)(19580395003)(87976001)(2351001)(5001920100001)(229853001)(122386002)(40100003)(50466002)(47776003)(46102003)(33646002)(50986999)(86362001)(66066001)(92566002)(48376002)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:AM2PR02MB0372;H:YoloCorp.int.ionis-it.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Ms-Exchange-Crosstenant-Originalarrivaltime: 06 Jun 2015 12:42:49.7291 (UTC) X-Ms-Exchange-Crosstenant-Fromentityheader: Hosted X-Ms-Exchange-Transport-Crosstenantheadersstamped: AM2PR02MB0372 X-Originatororg: epitech.eu Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 51 Organization: linux.* mail to news gateway X-Original-Cc: , , "Thomas de Beauchene" , Thomas de Beauchene X-Original-Date: Sat, 6 Jun 2015 14:42:34 +0200 X-Original-Message-ID: <1433594554-23857-1-git-send-email-thomas.chauvot-de-beauchene@epitech.eu> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: aioe.org linux.kernel:1159893 Updated struct file_operations documentation in vfs.txt to match current implementation Signed-off-by: Thomas de Beauchene --- Documentation/filesystems/vfs.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 5d833b3..510ff78 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -811,8 +811,9 @@ struct file_operations { long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *); + int (*mremap)(struct file *, struct vm_area_struct *); int (*open) (struct inode *, struct file *); - int (*flush) (struct file *); + int (*flush) (struct file *, fl_owner_t id); int (*release) (struct inode *, struct file *); int (*fsync) (struct file *, loff_t, loff_t, int datasync); int (*aio_fsync) (struct kiocb *, int datasync); @@ -822,11 +823,15 @@ struct file_operations { unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); int (*check_flags)(int); int (*flock) (struct file *, int, struct file_lock *); - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int); - ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int); - int (*setlease)(struct file *, long arg, struct file_lock **, void **); - long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len); + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); + ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); + int (*setlease)(struct file *, long, struct file_lock **, void **); + long (*fallocate)(struct file *file, int mode, loff_t offset, + loff_t len); void (*show_fdinfo)(struct seq_file *m, struct file *f); +#ifndef CONFIG_MMU + unsigned (*mmap_capabilities)(struct file *); +#endif }; Again, all methods are called without any locks being held, unless -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/