From: Steve French <sfrench@us.ibm.com>
Date: Thu, 19 Jul 2007 00:38:57 +0000 (+0000)
Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: firefly_0821_release~27674^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ff8392c32a2645d2665ca779ecb91bb29361c13;p=firefly-linux-kernel-4.4.55.git
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
---
1ff8392c32a2645d2665ca779ecb91bb29361c13
diff --cc fs/cifs/cifsfs.c
index 1cebb7e34215,bd0f2f2353ce..1fd0dc85f53c
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -856,10 -849,11 +856,11 @@@ static int cifs_oplock_thread(void *dum
__u16 netfid;
int rc;
+ set_freezable();
do {
- if (try_to_freeze())
+ if (try_to_freeze())
continue;
-
+
spin_lock(&GlobalMid_Lock);
if (list_empty(&GlobalOplock_Q)) {
spin_unlock(&GlobalMid_Lock);
diff --cc fs/cifs/export.c
index c21d3d09d0af,96df1d51fdc3..893fd0aebff8
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@@ -41,28 -30,24 +41,26 @@@
#include <linux/fs.h>
#include <linux/exportfs.h>
-
+#include "cifsglob.h"
+#include "cifs_debug.h"
+
-
#ifdef CONFIG_CIFS_EXPERIMENTAL
-
-
static struct dentry *cifs_get_parent(struct dentry *dentry)
{
- /* BB need to add code here eventually to enable export via NFSD */
- return ERR_PTR(-EACCES);
+ /* BB need to add code here eventually to enable export via NFSD */
+ cFYI(1, ("get parent for %p", dentry));
+ return ERR_PTR(-EACCES);
}
-
+
struct export_operations cifs_export_ops = {
- .get_parent = cifs_get_parent,
-/* Following five export operations are unneeded so far and can default */
-/* .get_dentry =
- .get_name =
- .find_exported_dentry =
- .decode_fh =
- .encode_fs = */
- };
-
+ .get_parent = cifs_get_parent,
+/* Following five export operations are unneeded so far and can default:
+ .get_dentry =
+ .get_name =
+ .find_exported_dentry =
+ .decode_fh =
+ .encode_fs = */
+};
+
#endif /* EXPERIMENTAL */
-
+