file export-do_kern_mount.patch was initially added on branch b1_5.

[fs/lustre-release.git] / lustre / smfs / ioctl.c

diff --git a/lustre/smfs/ioctl.c b/lustre/smfs/ioctl.c
index 0a3019a..4faae61 100644 (file)
--- a/lustre/smfs/ioctl.c
+++ b/lustre/smfs/ioctl.c
@@ -50,11 +50,11 @@ static struct super_block *smfs_get_sb_by_path(char *path, int len)
 {
         struct super_block *sb;
         struct nameidata nd;
-        int error = 0;
 
         ENTRY;
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
         if (path_init(path, LOOKUP_FOLLOW, &nd)) {
+                int error = 0;
                 error = path_walk(path, &nd);
                 if (error) {
                         path_release(&nd);
@@ -168,10 +168,11 @@ static struct file_operations smfscontrol_fops = {
         .open    = smfs_psdev_open,       /* open */
         .release = smfs_psdev_release,    /* release */
 };
+
 static struct miscdevice smfscontrol_dev = {
-        minor:        SMFS_MINOR,
-        name:        "smfscontrol",
-        fops:        &smfscontrol_fops
+        .minor         = SMFS_MINOR,
+        .name          = "smfscontrol",
+        .fops          = &smfscontrol_fops
 };
 
 int init_smfs_psdev(void)