diff options
| author | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
| commit | a0c034c3726715d1928b301ddd43c51799c0c07a (patch) | |
| tree | 76e78b4646ca0560d8cd0ee041a8bde9a5269c8c /fs | |
| parent | 086290148fc37d7f2eccb7026b18fb9539ec7820 (diff) | |
| parent | 9d0231c207faeda051cf54c1a64e1a147d2187fa (diff) | |
Merge commit 'v3.2.7' into rt-3.2.7-rt13v3.2.7-rt13
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 7 | ||||
| -rw-r--r-- | fs/cifs/dir.c | 2 | ||||
| -rw-r--r-- | fs/fs-writeback.c | 16 |
3 files changed, 13 insertions, 12 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 63e4be46eec4..720edf52dbf8 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -756,10 +756,11 @@ standard_receive3(struct TCP_Server_Info *server, struct mid_q_entry *mid) cifs_dump_mem("Bad SMB: ", buf, min_t(unsigned int, server->total_read, 48)); - if (mid) - handle_mid(mid, server, smb_buffer, length); + if (!mid) + return length; - return length; + handle_mid(mid, server, smb_buffer, length); + return 0; } static int diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d7eeb9d3ed6f..e4c333451137 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -492,7 +492,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, { int xid; int rc = 0; /* to get around spurious gcc warning, set to zero here */ - __u32 oplock = 0; + __u32 oplock = enable_oplocks ? REQ_OPLOCK : 0; __u16 fileHandle = 0; bool posix_open = false; struct cifs_sb_info *cifs_sb; diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 517f211a3bd4..54f578684496 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -48,14 +48,6 @@ struct wb_writeback_work { }; /* - * Include the creation of the trace points after defining the - * wb_writeback_work structure so that the definition remains local to this - * file. - */ -#define CREATE_TRACE_POINTS -#include <trace/events/writeback.h> - -/* * We don't actually have pdflush, but this one is exported though /proc... */ int nr_pdflush_threads; @@ -87,6 +79,14 @@ static inline struct inode *wb_inode(struct list_head *head) return list_entry(head, struct inode, i_wb_list); } +/* + * Include the creation of the trace points after defining the + * wb_writeback_work structure and inline functions so that the definition + * remains local to this file. + */ +#define CREATE_TRACE_POINTS +#include <trace/events/writeback.h> + /* Wakeup flusher thread or forker thread to fork it. Requires bdi->wb_lock. */ static void bdi_wakeup_flusher(struct backing_dev_info *bdi) { |