lkml.org 
[lkml]   [2013]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Documentation: Fix bad merge with tmpfile documentation
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


\
 
 \ /
  Last update: 2013-07-16 17:43    [W:0.027 / U:0.792 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site