* [PATCH] Documentation: Fix bad merge with tmpfile documentation
@ 2013-07-16 14:19 Jeff Mahoney
0 siblings, 0 replies; only message in thread
From: Jeff Mahoney @ 2013-07-16 14:19 UTC (permalink / raw)
To: Al Viro, Linux Kernel Maling List
Commit 48bde8d3 (Document ->tmpfile()) had a bad merge in vfs.txt,
where it put the new tmpfile prototype in the middle of the atomic_open
prototype.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
Documentation/filesystems/vfs.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/Documentation/filesystems/vfs.txt 2013-07-16 00:53:43.791018403 -0400
+++ b/Documentation/filesystems/vfs.txt 2013-07-16 00:59:16.008721223 -0400
@@ -360,11 +360,10 @@ struct inode_operations {
int (*removexattr) (struct dentry *, const char *);
void (*update_time)(struct inode *, struct timespec *, int);
int (*atomic_open)(struct inode *, struct dentry *,
- int (*tmpfile) (struct inode *, struct dentry *, umode_t);
-} ____cacheline_aligned;
struct file *, unsigned open_flag,
umode_t create_mode, int *opened);
-};
+ int (*tmpfile) (struct inode *, struct dentry *, umode_t);
+} ____cacheline_aligned;
Again, all methods are called without any locks being held, unless
otherwise noted.
--
Jeff Mahoney
SUSE Labs
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-07-16 14:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-16 14:19 [PATCH] Documentation: Fix bad merge with tmpfile documentation Jeff Mahoney
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.